From e72baa76b91fbcb2b16747cb7d2088723478a754 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 3 Feb 2023 12:37:58 +0100 Subject: [PATCH] [clangd] Add semantic token for labels Reviewed By: kadircet Differential Revision: https://reviews.llvm.org/D143260 --- clang-tools-extra/clangd/SemanticHighlighting.cpp | 6 ++++++ clang-tools-extra/clangd/SemanticHighlighting.h | 1 + .../clangd/unittests/SemanticHighlightingTests.cpp | 10 ++++++++++ 3 files changed, 17 insertions(+) diff --git a/clang-tools-extra/clangd/SemanticHighlighting.cpp b/clang-tools-extra/clangd/SemanticHighlighting.cpp index ec37476..6a835f3 100644 --- a/clang-tools-extra/clangd/SemanticHighlighting.cpp +++ b/clang-tools-extra/clangd/SemanticHighlighting.cpp @@ -166,6 +166,8 @@ std::optional kindForDecl(const NamedDecl *D, return HighlightingKind::TemplateParameter; if (isa(D)) return HighlightingKind::Concept; + if (isa(D)) + return HighlightingKind::Label; if (const auto *UUVD = dyn_cast(D)) { auto Targets = Resolver->resolveUsingValueDecl(UUVD); if (!Targets.empty() && Targets[0] != UUVD) { @@ -1271,6 +1273,8 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, HighlightingKind K) { return OS << "Operator"; case HighlightingKind::Bracket: return OS << "Bracket"; + case HighlightingKind::Label: + return OS << "Label"; case HighlightingKind::InactiveCode: return OS << "InactiveCode"; } @@ -1470,6 +1474,8 @@ llvm::StringRef toSemanticTokenType(HighlightingKind Kind) { return "operator"; case HighlightingKind::Bracket: return "bracket"; + case HighlightingKind::Label: + return "label"; case HighlightingKind::InactiveCode: return "comment"; } diff --git a/clang-tools-extra/clangd/SemanticHighlighting.h b/clang-tools-extra/clangd/SemanticHighlighting.h index c9db598..59d742b 100644 --- a/clang-tools-extra/clangd/SemanticHighlighting.h +++ b/clang-tools-extra/clangd/SemanticHighlighting.h @@ -52,6 +52,7 @@ enum class HighlightingKind { Modifier, Operator, Bracket, + Label, // This one is different from the other kinds as it's a line style // rather than a token style. diff --git a/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp b/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp index 9c6e524..ff052e6 100644 --- a/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp +++ b/clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp @@ -1028,6 +1028,16 @@ $Bracket[[>]]$Bracket[[>]] $LocalVariable_def[[s6]]; template $Bracket[[<]]$Concept[[C2]]$Bracket[[<]]int$Bracket[[>]] $TemplateParameter_def[[A]]$Bracket[[>]] class $Class_def[[B]] {}; )cpp", + // Labels + R"cpp( + bool $Function_def[[funcWithGoto]](bool $Parameter_def[[b]]) { + if ($Parameter[[b]]) + goto $Label[[return_true]]; + return false; + $Label_decl[[return_true]]: + return true; + } + )cpp", // no crash R"cpp( struct $Class_def[[Foo]] { -- 2.7.4