squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[clangd] Log use of heuristic go-to-def. NFC

Browse source 
Generally:
 - found results using this method -> log
 - no results using this method -> vlog
 - method wasn't applied because ineligible -> no log
This commit is contained in:
Sam McCall 2020-05-25 10:19:34 +02:00
parent 5b7ff6f07f
commit b752a2743a
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clang-tools-extra/clangd/XRefs.cpp
View file

@ -438,8 +438,11 @@ locateSymbolTextually(const SpelledWord &Word, ParsedAST &AST,
ScoredResults.push_back({Score, std::move(Located)});
});
if (TooMany)
if (TooMany) {
vlog("Heuristic index lookup for {0} returned too many candidates, ignored",
Word.Text);
return {};
}
llvm::sort(ScoredResults,
[](const ScoredLocatedSymbol &A, const ScoredLocatedSymbol &B) {
@ -448,6 +451,10 @@ locateSymbolTextually(const SpelledWord &Word, ParsedAST &AST,
std::vector<LocatedSymbol> Results;
for (auto &Res : std::move(ScoredResults))
Results.push_back(std::move(Res.second));
if (Results.empty())
vlog("No heuristic index definition for {0}", Word.Text);
else
log("Found definition heuristically in index for {0}", Word.Text);
return Results;
}
@ -570,13 +577,22 @@ std::vector<LocatedSymbol> locateSymbolAt(ParsedAST &AST, Position Pos,
// Is the same word nearby a real identifier that might refer to something?
if (const syntax::Token *NearbyIdent =
findNearbyIdentifier(*Word, AST.getTokens())) {
if (auto Macro = locateMacroReferent(*NearbyIdent, AST, *MainFilePath))
if (auto Macro = locateMacroReferent(*NearbyIdent, AST, *MainFilePath)) {
log("Found macro definition heuristically using nearby identifier {0}",
Word->Text);
return {*std::move(Macro)};
}
ASTResults =
locateASTReferent(NearbyIdent->location(), NearbyIdent, AST,
*MainFilePath, Index, /*NodeKind=*/nullptr);
if (!ASTResults.empty())
if (!ASTResults.empty()) {
log("Found definition heuristically using nearby identifier {0}",
NearbyIdent->text(SM));
return ASTResults;
} else {
vlog("No definition found using nearby identifier {0} at {1}",
Word->Text, Word->Location.printToString(SM));
}
}
// No nearby word, or it didn't refer to anything either. Try the index.
auto TextualResults =