[clangd] Added highlighting for non type templates.
Summary: Non type templates were not being highlighted. This highlights
them as TemplateParameters.
Reviewers: hokein, ilya-biryukov
Subscribers: MaskRay, jkorous, arphaman, kadircet, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D66221
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@369090 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/clangd/SemanticHighlighting.cpp b/clangd/SemanticHighlighting.cpp
index 1681360..babab5e 100644
--- a/clangd/SemanticHighlighting.cpp
+++ b/clangd/SemanticHighlighting.cpp
@@ -224,6 +224,10 @@
addToken(Loc, HighlightingKind::TemplateParameter);
return;
}
+ if (isa<NonTypeTemplateParmDecl>(D)) {
+ addToken(Loc, HighlightingKind::TemplateParameter);
+ return;
+ }
}
void addToken(SourceLocation Loc, HighlightingKind Kind) {
diff --git a/clangd/unittests/SemanticHighlightingTests.cpp b/clangd/unittests/SemanticHighlightingTests.cpp
index 2b9dc16..5c3fe9a 100644
--- a/clangd/unittests/SemanticHighlightingTests.cpp
+++ b/clangd/unittests/SemanticHighlightingTests.cpp
@@ -323,6 +323,59 @@
$Primitive[[auto]] $Variable[[Form]] = 10.2 + 2 * 4;
$Primitive[[decltype]]($Variable[[Form]]) $Variable[[F]] = 10;
auto $Variable[[Fun]] = []()->$Primitive[[void]]{};
+ )cpp",
+ R"cpp(
+ class $Class[[G]] {};
+ template<$Class[[G]] *$TemplateParameter[[U]]>
+ class $Class[[GP]] {};
+ template<$Class[[G]] &$TemplateParameter[[U]]>
+ class $Class[[GR]] {};
+ template<$Primitive[[int]] *$TemplateParameter[[U]]>
+ class $Class[[IP]] {
+ $Primitive[[void]] $Method[[f]]() {
+ *$TemplateParameter[[U]] += 5;
+ }
+ };
+ template<$Primitive[[unsigned]] $TemplateParameter[[U]] = 2>
+ class $Class[[Foo]] {
+ $Primitive[[void]] $Method[[f]]() {
+ for($Primitive[[int]] $Variable[[I]] = 0;
+ $Variable[[I]] < $TemplateParameter[[U]];) {}
+ }
+ };
+
+ $Class[[G]] $Variable[[L]];
+ $Primitive[[void]] $Function[[f]]() {
+ $Class[[Foo]]<123> $Variable[[F]];
+ $Class[[GP]]<&$Variable[[L]]> $Variable[[LL]];
+ $Class[[GR]]<$Variable[[L]]> $Variable[[LLL]];
+ }
+ )cpp",
+ R"cpp(
+ template<typename $TemplateParameter[[T]],
+ $Primitive[[void]] (T::*$TemplateParameter[[method]])($Primitive[[int]])>
+ struct $Class[[G]] {
+ $Primitive[[void]] $Method[[foo]](
+ $TemplateParameter[[T]] *$Variable[[O]]) {
+ ($Variable[[O]]->*$TemplateParameter[[method]])(10);
+ }
+ };
+ struct $Class[[F]] {
+ $Primitive[[void]] $Method[[f]]($Primitive[[int]]);
+ };
+ template<$Primitive[[void]] (*$TemplateParameter[[Func]])()>
+ struct $Class[[A]] {
+ $Primitive[[void]] $Method[[f]]() {
+ (*$TemplateParameter[[Func]])();
+ }
+ };
+
+ $Primitive[[void]] $Function[[foo]]() {
+ $Class[[F]] $Variable[[FF]];
+ $Class[[G]]<$Class[[F]], &$Class[[F]]::$Method[[f]]> $Variable[[GG]];
+ $Variable[[GG]].$Method[[foo]](&$Variable[[FF]]);
+ $Class[[A]]<$Function[[foo]]> $Variable[[AA]];
+ }
)cpp"};
for (const auto &TestCase : TestCases) {
checkHighlightings(TestCase);
