[clangd] Collect missing macro references.
Summary: Semantic highlghting is missing a few macro references.
Reviewers: ilya-biryukov
Subscribers: MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D68458
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@373889 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/clangd/CollectMacros.h b/clangd/CollectMacros.h
index 21227e1..619c9f5 100644
--- a/clangd/CollectMacros.h
+++ b/clangd/CollectMacros.h
@@ -25,7 +25,8 @@
std::vector<Range> Ranges;
};
-/// Collects macro definitions and expansions in the main file. It is used to:
+/// Collects macro references (e.g. definitions, expansions) in the main file.
+/// It is used to:
/// - collect macros in the preamble section of the main file (in Preamble.cpp)
/// - collect macros after the preamble of the main file (in ParsedAST.cpp)
class CollectMainFileMacros : public PPCallbacks {
@@ -49,6 +50,27 @@
add(MacroName, MD.getMacroInfo());
}
+ void MacroUndefined(const clang::Token &MacroName,
+ const clang::MacroDefinition &MD,
+ const clang::MacroDirective *Undef) override {
+ add(MacroName, MD.getMacroInfo());
+ }
+
+ void Ifdef(SourceLocation Loc, const Token &MacroName,
+ const MacroDefinition &MD) override {
+ add(MacroName, MD.getMacroInfo());
+ }
+
+ void Ifndef(SourceLocation Loc, const Token &MacroName,
+ const MacroDefinition &MD) override {
+ add(MacroName, MD.getMacroInfo());
+ }
+
+ void Defined(const Token &MacroName, const MacroDefinition &MD,
+ SourceRange Range) override {
+ add(MacroName, MD.getMacroInfo());
+ }
+
private:
void add(const Token &MacroNameTok, const MacroInfo *MI) {
if (!InMainFile)
@@ -57,7 +79,7 @@
if (Loc.isMacroID())
return;
- if (auto Range = getTokenRange(SM, LangOpts, MacroNameTok.getLocation())) {
+ if (auto Range = getTokenRange(SM, LangOpts, Loc)) {
Out.Names.insert(MacroNameTok.getIdentifierInfo()->getName());
Out.Ranges.push_back(*Range);
}
diff --git a/clangd/unittests/SemanticHighlightingTests.cpp b/clangd/unittests/SemanticHighlightingTests.cpp
index 06c8d3a..8003e35 100644
--- a/clangd/unittests/SemanticHighlightingTests.cpp
+++ b/clangd/unittests/SemanticHighlightingTests.cpp
@@ -476,6 +476,20 @@
$Macro[[assert]]($Variable[[x]] != $Function[[f]]());
}
)cpp",
+ // highlighting all macro references
+ R"cpp(
+ #ifndef $Macro[[name]]
+ #define $Macro[[name]]
+ #endif
+
+ #define $Macro[[test]]
+ #undef $Macro[[test]]
+ #ifdef $Macro[[test]]
+ #endif
+
+ #if defined($Macro[[test]])
+ #endif
+ )cpp",
R"cpp(
struct $Class[[S]] {
$Primitive[[float]] $Field[[Value]];
