replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[clangd] Sema ranking tweaks: downrank keywords and injected names. 

Summary:
Injected names being ranked too high was just a bug.
The high boost for keywords was intended, but was too much given how useless
keywords are. We should probably boost them on a case-by-case basis eventually.

Subscribers: ilya-biryukov, ioeric, MaskRay, jkorous, cfe-commits

Differential Revision: https://reviews.llvm.org/D48368

llvm-svn: 335723
This commit is contained in:
Sam McCall 2018-06-27 11:43:54 +00:00
parent eb1bef60b9
commit abe3737350
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang-tools-extra/clangd/Quality.cpp
View File

@ -156,8 +156,8 @@ float SymbolQualitySignals::evaluate() const {
Score *= 0.1f;
switch (Category) {
case Keyword: // Usually relevant, but misses most signals.
Score *= 10;
case Keyword: // Often relevant, but misses most signals.
Score *= 4; // FIXME: important keywords should have specific boosts.
break;
case Type:
case Function:
@ -241,10 +241,14 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
}
static SymbolRelevanceSignals::AccessibleScope
ComputeScope(const NamedDecl &D) {
ComputeScope(const NamedDecl *D) {
// Injected "Foo" within the class "Foo" has file scope, not class scope.
const DeclContext *DC = D->getDeclContext();
if (auto *R = dyn_cast_or_null<RecordDecl>(D))
if (R->isInjectedClassName())
DC = DC->getParent();
bool InClass = false;
for (const DeclContext *DC = D.getDeclContext(); !DC->isFileContext();
DC = DC->getParent()) {
for (; !DC->isFileContext(); DC = DC->getParent()) {
if (DC->isFunctionOrMethod())
return SymbolRelevanceSignals::FunctionScope;
InClass = InClass || DC->isRecord();
@ -252,7 +256,7 @@ ComputeScope(const NamedDecl &D) {
if (InClass)
return SymbolRelevanceSignals::ClassScope;
// This threshold could be tweaked, e.g. to treat module-visible as global.
if (D.getLinkageInternal() < ExternalLinkage)
if (D->getLinkageInternal() < ExternalLinkage)
return SymbolRelevanceSignals::FileScope;
return SymbolRelevanceSignals::GlobalScope;
}
@ -280,7 +284,7 @@ void SymbolRelevanceSignals::merge(const CodeCompletionResult &SemaCCResult) {
// Declarations are scoped, others (like macros) are assumed global.
if (SemaCCResult.Declaration)
Scope = std::min(Scope, ComputeScope(*SemaCCResult.Declaration));
Scope = std::min(Scope, ComputeScope(SemaCCResult.Declaration));
}
float SymbolRelevanceSignals::evaluate() const {

5
clang-tools-extra/unittests/clangd/QualityTests.cpp
View File

@ -84,6 +84,7 @@ TEST(QualityTests, SymbolRelevanceSignalExtraction) {
int deprecated() { return 0; }
namespace { struct X { void y() { int z; } }; }
struct S{}
)cpp";
auto AST = Test.build();
@ -115,6 +116,10 @@ TEST(QualityTests, SymbolRelevanceSignalExtraction) {
Relevance = {};
Relevance.merge(CodeCompletionResult(&findAnyDecl(AST, "z"), 42));
EXPECT_EQ(Relevance.Scope, SymbolRelevanceSignals::FunctionScope);
// The injected class name is treated as the outer class name.
Relevance = {};
Relevance.merge(CodeCompletionResult(&findDecl(AST, "S::S"), 42));
EXPECT_EQ(Relevance.Scope, SymbolRelevanceSignals::GlobalScope);
}
// Do the signals move the scores in the direction we expect?