Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 15:45:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve fuzzy matching heuristics.

Browse Source
This commit is contained in:
Fangrui Song 2018-03-23 14:57:52 -07:00
parent 4a95eda9d7
commit 6c95649904
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/fuzzy_match.cc
View File

@ -46,7 +46,7 @@ void CalculateRoles(std::string_view s, int roles[], int* class_set) {
} // namespace } // namespace
int FuzzyMatcher::MissScore(int j, bool last) { int FuzzyMatcher::MissScore(int j, bool last) {
int s = last ? -20 : 0; int s = last ? -10 : 0;
if (text_role[j] == Head) if (text_role[j] == Head)
s -= 10; s -= 10;
return s; return s;
@ -57,14 +57,16 @@ int FuzzyMatcher::MatchScore(int i, int j, bool last) {
if (pat[i] == text[j]) { if (pat[i] == text[j]) {
s++; s++;
if ((pat_set & 1 << Upper) || i == j) if ((pat_set & 1 << Upper) || i == j)
s += 10; s++;
} }
if (pat_role[i] == Head && text_role[j] == Head) if (pat_role[i] == Head) {
if (text_role[j] == Head)
s += 30; s += 30;
else if (text_role[j] == Tail)
s -= 10;
}
if (text_role[j] == Tail && i && !last) if (text_role[j] == Tail && i && !last)
s -= 30; s -= 30;
if (pat_role[i] == Head && text_role[j] == Tail)
s -= 10;
if (i == 0 && text_role[j] == Tail) if (i == 0 && text_role[j] == Tail)
s -= 40; s -= 40;
return s; return s;
@ -133,7 +135,7 @@ TEST_SUITE("fuzzy_match") {
ret = false; ret = false;
break; break;
} }
if (1 || !ret) { if (!ret) {
for (size_t i = 0; i < texts.size(); i++) for (size_t i = 0; i < texts.size(); i++)
printf("%s %d ", texts[i], scores[i]); printf("%s %d ", texts[i], scores[i]);
puts(""); puts("");
@ -147,22 +149,24 @@ TEST_SUITE("fuzzy_match") {
CHECK(fuzzy.Match("aaa") < 0); CHECK(fuzzy.Match("aaa") < 0);
// case // case
Ranks("monad", {"monad", "Monad", "mONAD"}); CHECK(Ranks("monad", {"monad", "Monad", "mONAD"}));
// initials // initials
Ranks("ab", {"ab", "aoo_boo", "acb"}); CHECK(Ranks("ab", {"ab", "aoo_boo", "acb"}));
Ranks("CC", {"CamelCase", "camelCase", "camelcase"}); CHECK(Ranks("CC", {"CamelCase", "camelCase", "camelcase"}));
Ranks("cC", {"camelCase", "CamelCase", "camelcase"}); CHECK(Ranks("cC", {"camelCase", "CamelCase", "camelcase"}));
Ranks("c c", CHECK(Ranks("c c", {"camel case", "camelCase", "CamelCase", "camelcase",
{"camel case", "camelCase", "CamelCase", "camelcase", "camel ace"}); "camel ace"}));
Ranks("Da.Te", {"Data.Text", "Data.Text.Lazy", "Data.Aeson.Encoding.text"}); CHECK(Ranks("Da.Te",
{"Data.Text", "Data.Text.Lazy", "Data.Aeson.Encoding.text"}));
CHECK(Ranks("foo bar.h", {"foo/bar.h", "foobar.h"}));
// prefix // prefix
Ranks("is", {"isIEEE", "inSuf"}); CHECK(Ranks("is", {"isIEEE", "inSuf"}));
// shorter // shorter
Ranks("ma", {"map", "many", "maximum"}); CHECK(Ranks("ma", {"map", "many", "maximum"}));
Ranks("print", {"printf", "sprintf"}); CHECK(Ranks("print", {"printf", "sprintf"}));
// score(PRINT) = kMinScore // score(PRINT) = kMinScore
Ranks("ast", {"ast", "AST", "INT_FAST16_MAX"}); CHECK(Ranks("ast", {"ast", "AST", "INT_FAST16_MAX"}));
// score(PRINT) > kMinScore // score(PRINT) > kMinScore
Ranks("Int", {"int", "INT", "PRINT"}); CHECK(Ranks("Int", {"int", "INT", "PRINT"}));
} }
} }