[clangd] Get rid of QueryScopes.empty() == AnyScope special case.
Reviewers: sammccall
Reviewed By: sammccall
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, cfe-commits
Differential Revision: https://reviews.llvm.org/D53933
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@346223 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/clangd/FindSymbols.cpp b/clangd/FindSymbols.cpp
index f6d3cf5..64a0896 100644
--- a/clangd/FindSymbols.cpp
+++ b/clangd/FindSymbols.cpp
@@ -116,6 +116,8 @@
// not).
if (IsGlobalQuery || !Names.first.empty())
Req.Scopes = {Names.first};
+ else
+ Req.AnyScope = true;
if (Limit)
Req.Limit = Limit;
TopN<ScoredSymbolInfo, ScoredSymbolGreater> Top(
diff --git a/clangd/index/Index.h b/clangd/index/Index.h
index b5d7809..76148f1 100644
--- a/clangd/index/Index.h
+++ b/clangd/index/Index.h
@@ -460,9 +460,6 @@
/// namespace xyz::abc.
///
/// The global scope is "", a top level scope is "foo::", etc.
- /// FIXME: drop the special case for empty list, which is the same as
- /// `AnyScope = true`.
- /// FIXME: support scope proximity.
std::vector<std::string> Scopes;
/// If set to true, allow symbols from any scope. Scopes explicitly listed
/// above will be ranked higher.
diff --git a/clangd/index/MemIndex.cpp b/clangd/index/MemIndex.cpp
index 5c12487..42340e8 100644
--- a/clangd/index/MemIndex.cpp
+++ b/clangd/index/MemIndex.cpp
@@ -39,8 +39,7 @@
const Symbol *Sym = Pair.second;
// Exact match against all possible scopes.
- if (!Req.AnyScope && !Req.Scopes.empty() &&
- !is_contained(Req.Scopes, Sym->Scope))
+ if (!Req.AnyScope && !is_contained(Req.Scopes, Sym->Scope))
continue;
if (Req.RestrictForCodeCompletion &&
!(Sym->Flags & Symbol::IndexedForCodeCompletion))
diff --git a/clangd/index/dex/Dex.cpp b/clangd/index/dex/Dex.cpp
index 9dab722..ba6c325 100644
--- a/clangd/index/dex/Dex.cpp
+++ b/clangd/index/dex/Dex.cpp
@@ -178,7 +178,7 @@
std::vector<std::unique_ptr<Iterator>> ScopeIterators;
for (const auto &Scope : Req.Scopes)
ScopeIterators.push_back(iterator(Token(Token::Kind::Scope, Scope)));
- if (Req.AnyScope || /*legacy*/ Req.Scopes.empty())
+ if (Req.AnyScope)
ScopeIterators.push_back(
Corpus.boost(Corpus.all(), ScopeIterators.empty() ? 1.0 : 0.2));
Criteria.push_back(Corpus.unionOf(move(ScopeIterators)));
diff --git a/unittests/clangd/DexTests.cpp b/unittests/clangd/DexTests.cpp
index 450d7e8..6bf8111 100644
--- a/unittests/clangd/DexTests.cpp
+++ b/unittests/clangd/DexTests.cpp
@@ -485,6 +485,7 @@
UnorderedElementsAre("other::A", "other::ABC"));
Req.Query = "";
Req.Scopes = {};
+ Req.AnyScope = true;
EXPECT_THAT(match(*Index, Req),
UnorderedElementsAre("ns::ABC", "ns::BCD", "::ABC",
"ns::nested::ABC", "other::ABC",
@@ -495,6 +496,7 @@
auto I = Dex::build(generateNumSymbols(0, 100), RefSlab(), URISchemes);
FuzzyFindRequest Req;
Req.Query = "5";
+ Req.AnyScope = true;
Req.Limit = 3;
bool Incomplete;
auto Matches = match(*I, Req, &Incomplete);
@@ -509,6 +511,7 @@
RefSlab(), URISchemes);
FuzzyFindRequest Req;
Req.Query = "lol";
+ Req.AnyScope = true;
Req.Limit = 2;
EXPECT_THAT(match(*I, Req),
UnorderedElementsAre("LaughingOutLoud", "LittleOldLady"));
@@ -518,6 +521,7 @@
auto I =
Dex::build(generateSymbols({"OneTwoThreeFour"}), RefSlab(), URISchemes);
FuzzyFindRequest Req;
+ Req.AnyScope = true;
bool Incomplete;
EXPECT_THAT(match(*I, Req, &Incomplete), ElementsAre("OneTwoThreeFour"));
@@ -540,6 +544,7 @@
auto I = Dex::build(generateSymbols({"a::y1", "b::y2", "y3"}), RefSlab(),
URISchemes);
FuzzyFindRequest Req;
+ Req.AnyScope = true;
Req.Query = "y";
EXPECT_THAT(match(*I, Req), UnorderedElementsAre("a::y1", "b::y2", "y3"));
}
@@ -584,9 +589,9 @@
auto I =
Dex::build(generateSymbols({"a::y1", "a::b::y2", "c::y3"}), RefSlab(), URISchemes);
FuzzyFindRequest Req;
+ Req.AnyScope = true;
Req.Query = "y";
Req.Scopes = {"a::"};
- Req.AnyScope = true;
EXPECT_THAT(match(*I, Req),
UnorderedElementsAre("a::y1", "a::b::y2", "c::y3"));
}
@@ -626,6 +631,7 @@
std::vector<Symbol> Symbols{CodeCompletionSymbol, NonCodeCompletionSymbol};
Dex I(Symbols, RefSlab(), URISchemes);
FuzzyFindRequest Req;
+ Req.AnyScope = true;
Req.RestrictForCodeCompletion = false;
EXPECT_THAT(match(I, Req), ElementsAre("Completion", "NoCompletion"));
Req.RestrictForCodeCompletion = true;
@@ -642,6 +648,7 @@
Dex I(Symbols, RefSlab(), URISchemes);
FuzzyFindRequest Req;
+ Req.AnyScope = true;
Req.Query = "abc";
// The best candidate can change depending on the proximity paths.
Req.Limit = 1;
diff --git a/unittests/clangd/IndexTests.cpp b/unittests/clangd/IndexTests.cpp
index 77b59c1..286941b 100644
--- a/unittests/clangd/IndexTests.cpp
+++ b/unittests/clangd/IndexTests.cpp
@@ -90,6 +90,7 @@
symbol("2") /* duplicate */};
FuzzyFindRequest Req;
Req.Query = "2";
+ Req.AnyScope = true;
MemIndex I(Symbols, RefSlab());
EXPECT_THAT(match(I, Req), ElementsAre("2"));
}
@@ -98,6 +99,7 @@
auto I = MemIndex::build(generateNumSymbols(0, 100), RefSlab());
FuzzyFindRequest Req;
Req.Query = "5";
+ Req.AnyScope = true;
Req.Limit = 3;
bool Incomplete;
auto Matches = match(*I, Req, &Incomplete);
@@ -112,6 +114,7 @@
RefSlab());
FuzzyFindRequest Req;
Req.Query = "lol";
+ Req.AnyScope = true;
Req.Limit = 2;
EXPECT_THAT(match(*I, Req),
UnorderedElementsAre("LaughingOutLoud", "LittleOldLady"));
@@ -122,6 +125,7 @@
MemIndex::build(generateSymbols({"a::y1", "b::y2", "y3"}), RefSlab());
FuzzyFindRequest Req;
Req.Query = "y";
+ Req.AnyScope = true;
EXPECT_THAT(match(*I, Req), UnorderedElementsAre("a::y1", "b::y2", "y3"));
}
diff --git a/unittests/clangd/SyncAPI.cpp b/unittests/clangd/SyncAPI.cpp
index 019bba0..dd6f37c 100644
--- a/unittests/clangd/SyncAPI.cpp
+++ b/unittests/clangd/SyncAPI.cpp
@@ -130,6 +130,7 @@
SymbolSlab runFuzzyFind(const SymbolIndex &Index, StringRef Query) {
FuzzyFindRequest Req;
Req.Query = Query;
+ Req.AnyScope = true;
return runFuzzyFind(Index, Req);
}
