Index->lookup(QueryRequest, [&](const Symbol &Sym) {
auto &R = Result[ResultIndex.lookup(Sym.ID)];
- // Special case: if the AST yielded a definition, then it may not be
- // the right *declaration*. Prefer the one from the index.
if (R.Definition) { // from AST
+ // Special case: if the AST yielded a definition, then it may not be
+ // the right *declaration*. Prefer the one from the index.
if (auto Loc = toLSPLocation(Sym.CanonicalDeclaration, *MainFilePath))
R.PreferredDeclaration = *Loc;
+
+ // We might still prefer the definition from the index, e.g. for
+ // generated symbols.
+ if (auto Loc = toLSPLocation(
+ getPreferredLocation(*R.Definition, Sym.Definition, Scratch),
+ *MainFilePath))
+ R.Definition = *Loc;
} else {
R.Definition = toLSPLocation(Sym.Definition, *MainFilePath);
- if (Sym.CanonicalDeclaration) {
- // Use merge logic to choose AST or index declaration.
- // We only do this for declarations as definitions from AST
- // is generally preferred (e.g. definitions in main file).
- if (auto Loc = toLSPLocation(
- getPreferredLocation(R.PreferredDeclaration,
- Sym.CanonicalDeclaration, Scratch),
- *MainFilePath))
- R.PreferredDeclaration = *Loc;
- }
+ // Use merge logic to choose AST or index declaration.
+ if (auto Loc = toLSPLocation(
+ getPreferredLocation(R.PreferredDeclaration,
+ Sym.CanonicalDeclaration, Scratch),
+ *MainFilePath))
+ R.PreferredDeclaration = *Loc;
}
});
}
TEST(LocateSymbol, WithIndexPreferredLocation) {
Annotations SymbolHeader(R"cpp(
- class $[[Proto]] {};
+ class $p[[Proto]] {};
+ void $f[[func]]() {};
)cpp");
TestTU TU;
TU.HeaderCode = SymbolHeader.code();
Annotations Test(R"cpp(// only declaration in AST.
// Shift to make range different.
- class [[Proto]];
- P^roto* create();
+ class Proto;
+ void func() {}
+ P$p^roto* create() {
+ fu$f^nc();
+ return nullptr;
+ }
)cpp");
auto AST = TestTU::withCode(Test.code()).build();
- auto Locs = clangd::locateSymbolAt(AST, Test.point(), Index.get());
- EXPECT_THAT(Locs, ElementsAre(Sym("Proto", SymbolHeader.range())));
+ {
+ auto Locs = clangd::locateSymbolAt(AST, Test.point("p"), Index.get());
+ auto CodeGenLoc = SymbolHeader.range("p");
+ EXPECT_THAT(Locs, ElementsAre(Sym("Proto", CodeGenLoc, CodeGenLoc)));
+ }
+ {
+ auto Locs = clangd::locateSymbolAt(AST, Test.point("f"), Index.get());
+ auto CodeGenLoc = SymbolHeader.range("f");
+ EXPECT_THAT(Locs, ElementsAre(Sym("func", CodeGenLoc, CodeGenLoc)));
+ }
}
TEST(LocateSymbol, All) {