summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Liu <ioeric@google.com>2017-12-20 09:29:54 +0000
committerEric Liu <ioeric@google.com>2017-12-20 09:29:54 +0000
commit44fb880b33ca87bfe34a57145fb1fd3f9b03613d (patch)
tree252bb2e8a32e7e0ded4e0e7e43abdb1fde782557
parentf114dc5e5187a125c13f195ba415e17fccd7ebf0 (diff)
[clangd] Igore cases in index fuzzy find.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@321157 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--clangd/index/MemIndex.cpp2
-rw-r--r--unittests/clangd/IndexTests.cpp10
2 files changed, 11 insertions, 1 deletions
diff --git a/clangd/index/MemIndex.cpp b/clangd/index/MemIndex.cpp
index 84db3274..d0d8084f 100644
--- a/clangd/index/MemIndex.cpp
+++ b/clangd/index/MemIndex.cpp
@@ -49,7 +49,7 @@ bool MemIndex::fuzzyFind(const Context &Ctx, const FuzzyFindRequest &Req,
continue;
// FIXME(ioeric): use fuzzy matcher.
- if (StringRef(StringRef(Sym->Name).lower()).contains(Req.Query)) {
+ if (StringRef(Sym->Name).find_lower(Req.Query) != StringRef::npos) {
if (++Matched > Req.MaxCandidateCount)
return false;
Callback(*Sym);
diff --git a/unittests/clangd/IndexTests.cpp b/unittests/clangd/IndexTests.cpp
index ea0ea794..a556424c 100644
--- a/unittests/clangd/IndexTests.cpp
+++ b/unittests/clangd/IndexTests.cpp
@@ -178,6 +178,16 @@ TEST(MemIndexTest, NoMatchNestedScopes) {
EXPECT_THAT(match(I, Req), UnorderedElementsAre("a::xyz"));
}
+TEST(MemIndexTest, IgnoreCases) {
+ MemIndex I;
+ I.build(generateSymbols({"ns::ABC", "ns::abc"}));
+ FuzzyFindRequest Req;
+ Req.Query = "AB";
+ Req.Scopes = {"ns"};
+ auto Matches = match(I, Req);
+ EXPECT_THAT(match(I, Req), UnorderedElementsAre("ns::ABC", "ns::abc"));
+}
+
} // namespace
} // namespace clangd
} // namespace clang