This revision was automatically updated to reflect the committed changes.
Closed by commit rG583ba07884ed: [clangd] Add xref for macros to FileIndex.
(authored by usaxena95).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D71406/new/
https://reviews.llvm.org/D71406
Files:
clang-tools-extra/clangd/index/FileIndex.cpp
clang-tools-extra/clangd/index/FileIndex.h
clang-tools-extra/clangd/index/SymbolCollector.cpp
clang-tools-extra/clangd/index/SymbolCollector.h
clang-tools-extra/clangd/unittests/FileIndexTests.cpp
Index: clang-tools-extra/clangd/unittests/FileIndexTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FileIndexTests.cpp
+++ clang-tools-extra/clangd/unittests/FileIndexTests.cpp
@@ -345,6 +345,40 @@
FileURI("unittest:///test2.cc"))}));
}
+TEST(FileIndexTest, MacroRefs) {
+ Annotations HeaderCode(R"cpp(
+ #define $def1[[HEADER_MACRO]](X) (X+1)
+ )cpp");
+ Annotations MainCode(R"cpp(
+ #define $def2[[MAINFILE_MACRO]](X) (X+1)
+ void f() {
+ int a = $ref1[[HEADER_MACRO]](2);
+ int b = $ref2[[MAINFILE_MACRO]](1);
+ }
+ )cpp");
+
+ FileIndex Index;
+ // Add test.cc
+ TestTU Test;
+ Test.HeaderCode = HeaderCode.code();
+ Test.Code = MainCode.code();
+ Test.Filename = "test.cc";
+ auto AST = Test.build();
+ Index.updateMain(Test.Filename, AST);
+
+ auto HeaderMacro = findSymbol(Test.headerSymbols(), "HEADER_MACRO");
+ EXPECT_THAT(getRefs(Index, HeaderMacro.ID),
+ RefsAre({AllOf(RefRange(MainCode.range("ref1")),
+ FileURI("unittest:///test.cc"))}));
+
+ auto MainFileMacro = findSymbol(Test.headerSymbols(), "MAINFILE_MACRO");
+ EXPECT_THAT(getRefs(Index, MainFileMacro.ID),
+ RefsAre({AllOf(RefRange(MainCode.range("def2")),
+ FileURI("unittest:///test.cc")),
+ AllOf(RefRange(MainCode.range("ref2")),
+ FileURI("unittest:///test.cc"))}));
+}
+
TEST(FileIndexTest, CollectMacros) {
FileIndex M;
update(M, "f", "#define CLANGD 1");
Index: clang-tools-extra/clangd/index/SymbolCollector.h
===================================================================
--- clang-tools-extra/clangd/index/SymbolCollector.h
+++ clang-tools-extra/clangd/index/SymbolCollector.h
@@ -9,6 +9,7 @@
#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_INDEX_SYMBOL_COLLECTOR_H
#include "CanonicalIncludes.h"
+#include "CollectMacros.h"
#include "Index.h"
#include "SymbolOrigin.h"
#include "clang/AST/ASTContext.h"
@@ -108,6 +109,8 @@
index::SymbolRoleSet Roles,
SourceLocation Loc) override;
+ void handleMacros(const MainFileMacros &MacroRefsToIndex);
+
SymbolSlab takeSymbols() { return std::move(Symbols).build(); }
RefSlab takeRefs() { return std::move(Refs).build(); }
RelationSlab takeRelations() { return std::move(Relations).build(); }
Index: clang-tools-extra/clangd/index/SymbolCollector.cpp
===================================================================
--- clang-tools-extra/clangd/index/SymbolCollector.cpp
+++ clang-tools-extra/clangd/index/SymbolCollector.cpp
@@ -346,6 +346,29 @@
return true;
}
+void SymbolCollector::handleMacros(const MainFileMacros &MacroRefsToIndex) {
+ assert(PP.get());
+ const auto &SM = PP->getSourceManager();
+ const auto *MainFileEntry = SM.getFileEntryForID(SM.getMainFileID());
+ assert(MainFileEntry);
+
+ const auto MainFileURI = toURI(SM, MainFileEntry->getName(), Opts);
+ // Add macro references.
+ for (const auto &IDToRefs : MacroRefsToIndex.MacroRefs) {
+ for (const auto &Range : IDToRefs.second) {
+ Ref R;
+ R.Location.Start.setLine(Range.start.line);
+ R.Location.Start.setColumn(Range.start.character);
+ R.Location.End.setLine(Range.end.line);
+ R.Location.End.setColumn(Range.end.character);
+ R.Location.FileURI = MainFileURI.c_str();
+ // FIXME: Add correct RefKind information to MainFileMacros.
+ R.Kind = RefKind::Reference;
+ Refs.insert(IDToRefs.first, R);
+ }
+ }
+}
+
bool SymbolCollector::handleMacroOccurrence(const IdentifierInfo *Name,
const MacroInfo *MI,
index::SymbolRoleSet Roles,
Index: clang-tools-extra/clangd/index/FileIndex.h
===================================================================
--- clang-tools-extra/clangd/index/FileIndex.h
+++ clang-tools-extra/clangd/index/FileIndex.h
@@ -140,7 +140,7 @@
/// Exposed to assist in unit tests.
SlabTuple indexMainDecls(ParsedAST &AST);
-/// Idex declarations from \p AST and macros from \p PP that are declared in
+/// Index declarations from \p AST and macros from \p PP that are declared in
/// included headers.
SlabTuple indexHeaderSymbols(ASTContext &AST, std::shared_ptr<Preprocessor> PP,
const CanonicalIncludes &Includes);
Index: clang-tools-extra/clangd/index/FileIndex.cpp
===================================================================
--- clang-tools-extra/clangd/index/FileIndex.cpp
+++ clang-tools-extra/clangd/index/FileIndex.cpp
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
#include "FileIndex.h"
+#include "CollectMacros.h"
#include "Logger.h"
#include "ParsedAST.h"
#include "SymbolCollector.h"
@@ -32,6 +33,7 @@
static SlabTuple indexSymbols(ASTContext &AST, std::shared_ptr<Preprocessor> PP,
llvm::ArrayRef<Decl *> DeclsToIndex,
+ const MainFileMacros *MacroRefsToIndex,
const CanonicalIncludes &Includes,
bool IsIndexMainAST) {
SymbolCollector::Options CollectorOpts;
@@ -59,6 +61,8 @@
SymbolCollector Collector(std::move(CollectorOpts));
Collector.setPreprocessor(PP);
+ if (MacroRefsToIndex)
+ Collector.handleMacros(*MacroRefsToIndex);
index::indexTopLevelDecls(AST, *PP, DeclsToIndex, Collector, IndexOpts);
const auto &SM = AST.getSourceManager();
@@ -68,6 +72,7 @@
auto Syms = Collector.takeSymbols();
auto Refs = Collector.takeRefs();
auto Relations = Collector.takeRelations();
+
vlog("index AST for {0} (main={1}): \n"
" symbol slab: {2} symbols, {3} bytes\n"
" ref slab: {4} symbols, {5} refs, {6} bytes\n"
@@ -80,7 +85,8 @@
SlabTuple indexMainDecls(ParsedAST &AST) {
return indexSymbols(AST.getASTContext(), AST.getPreprocessorPtr(),
- AST.getLocalTopLevelDecls(), AST.getCanonicalIncludes(),
+ AST.getLocalTopLevelDecls(), &AST.getMacros(),
+ AST.getCanonicalIncludes(),
/*IsIndexMainAST=*/true);
}
@@ -89,7 +95,8 @@
std::vector<Decl *> DeclsToIndex(
AST.getTranslationUnitDecl()->decls().begin(),
AST.getTranslationUnitDecl()->decls().end());
- return indexSymbols(AST, std::move(PP), DeclsToIndex, Includes,
+ return indexSymbols(AST, std::move(PP), DeclsToIndex,
+ /*MainFileMacros=*/nullptr, Includes,
/*IsIndexMainAST=*/false);
}
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
