// Mark D as referenced if this is a reference coming from the main file.
// D may not be an interesting symbol, but it's cheaper to check at the end.
auto &SM = ASTCtx->getSourceManager();
- auto SpellingLoc = SM.getSpellingLoc(Loc);
if (Opts.CountReferences &&
(Roles & static_cast<unsigned>(index::SymbolRole::Reference)) &&
- SM.getFileID(SpellingLoc) == SM.getMainFileID())
+ SM.getFileID(SM.getSpellingLoc(Loc)) == SM.getMainFileID())
ReferencedDecls.insert(ND);
auto ID = getSymbolID(ND);
!shouldCollectSymbol(*ND, *ASTCtx, Opts, IsMainFileOnly))
return true;
// Do not store references to main-file symbols.
+ // Unlike other fields, e.g. Symbols (which use spelling locations), we use
+ // file locations for references (as it aligns the behavior of clangd's
+ // AST-based xref).
+ // FIXME: we should try to use the file locations for other fields.
if (CollectRef && !IsMainFileOnly && !isa<NamespaceDecl>(ND) &&
- (Opts.RefsInHeaders || SM.getFileID(SpellingLoc) == SM.getMainFileID()))
- DeclRefs[ND].emplace_back(SpellingLoc, Roles);
+ (Opts.RefsInHeaders ||
+ SM.getFileID(SM.getFileLoc(Loc)) == SM.getMainFileID()))
+ DeclRefs[ND].emplace_back(SM.getFileLoc(Loc), Roles);
// Don't continue indexing if this is a mere reference.
if (IsOnlyRef)
return true;
HaveRanges(Header.ranges()))));
}
+TEST_F(SymbolCollectorTest, RefsOnMacros) {
+ // Refs collected from SymbolCollector behave in the same way as
+ // AST-based xrefs.
+ CollectorOpts.RefFilter = RefKind::All;
+ CollectorOpts.RefsInHeaders = true;
+ Annotations Header(R"(
+ #define TYPE(X) X
+ #define FOO Foo
+ #define CAT(X, Y) X##Y
+ class [[Foo]] {};
+ void test() {
+ TYPE([[Foo]]) foo;
+ [[FOO]] foo2;
+ TYPE(TYPE([[Foo]])) foo3;
+ [[CAT]](Fo, o) foo4;
+ }
+ )");
+ CollectorOpts.RefFilter = RefKind::All;
+ runSymbolCollector(Header.code(), "");
+ EXPECT_THAT(Refs, Contains(Pair(findSymbol(Symbols, "Foo").ID,
+ HaveRanges(Header.ranges()))));
+}
+
TEST_F(SymbolCollectorTest, HeaderAsMainFile) {
CollectorOpts.RefFilter = RefKind::All;
Annotations Header(R"(