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

Add strict to FuzzyMatcher::Match

Browse Source 
In completion, underscore prefixed builtin macros may be annoying when the first type character is not an underscore.

When `strict` is true, `Match` enforces the first characters should be loosely of the same category.
This commit is contained in:
Fangrui Song 2018-12-20 00:00:42 -08:00
parent 836caba19b
commit 6e8a45b25e
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fuzzy_match.cc
View File

@ -95,7 +95,9 @@ FuzzyMatcher::FuzzyMatcher(std::string_view pattern, int sensitivity) {
} }
} }
int FuzzyMatcher::Match(std::string_view text) { int FuzzyMatcher::Match(std::string_view text, bool strict) {
if (pat.empty() != text.empty())
return kMinScore;
int n = int(text.size()); int n = int(text.size());
if (n > kMaxText) if (n > kMaxText)
return kMinScore + 1; return kMinScore + 1;
@ -103,6 +105,8 @@ int FuzzyMatcher::Match(std::string_view text) {
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
low_text[i] = (char)::tolower(text[i]); low_text[i] = (char)::tolower(text[i]);
CalculateRoles(text, text_role, &text_set); CalculateRoles(text, text_role, &text_set);
if (strict && n && !!pat_role[0] != !!text_role[0])
return kMinScore;
dp[0][0][0] = dp[0][0][1] = 0; dp[0][0][0] = dp[0][0][1] = 0;
for (int j = 0; j < n; j++) { for (int j = 0; j < n; j++) {
dp[0][j + 1][0] = dp[0][j][0] + MissScore(j, false); dp[0][j + 1][0] = dp[0][j][0] + MissScore(j, false);

2
src/fuzzy_match.hh
View File

@ -17,7 +17,7 @@ public:
constexpr static int kMinScore = INT_MIN / 4; constexpr static int kMinScore = INT_MIN / 4;
FuzzyMatcher(std::string_view pattern, int case_sensitivity); FuzzyMatcher(std::string_view pattern, int case_sensitivity);
int Match(std::string_view text); int Match(std::string_view text, bool strict);
private: private:
int case_sensitivity; int case_sensitivity;

2
src/messages/textDocument_completion.cc
View File

@ -163,7 +163,7 @@ void FilterCandidates(CompletionList &result, const std::string &complete_text,
const std::string &filter = const std::string &filter =
item.filterText.size() ? item.filterText : item.label; item.filterText.size() ? item.filterText : item.label;
item.score_ = ReverseSubseqMatch(complete_text, filter, sensitive) >= 0 item.score_ = ReverseSubseqMatch(complete_text, filter, sensitive) >= 0
? fuzzy.Match(filter) ? fuzzy.Match(filter, true)
: FuzzyMatcher::kMinScore; : FuzzyMatcher::kMinScore;
} }
items.erase(std::remove_if(items.begin(), items.end(), items.erase(std::remove_if(items.begin(), items.end(),

4
src/messages/workspace.cc
View File

@ -168,8 +168,8 @@ done_add:
longest, int(db->GetSymbolName(std::get<2>(cand), true).size())); longest, int(db->GetSymbolName(std::get<2>(cand), true).size()));
FuzzyMatcher fuzzy(query, g_config->workspaceSymbol.caseSensitivity); FuzzyMatcher fuzzy(query, g_config->workspaceSymbol.caseSensitivity);
for (auto &cand : cands) for (auto &cand : cands)
std::get<1>(cand) = std::get<1>(cand) = fuzzy.Match(
fuzzy.Match(db->GetSymbolName(std::get<2>(cand), std::get<1>(cand))); db->GetSymbolName(std::get<2>(cand), std::get<1>(cand)), false);
std::sort(cands.begin(), cands.end(), [](const auto &l, const auto &r) { std::sort(cands.begin(), cands.end(), [](const auto &l, const auto &r) {
return std::get<1>(l) > std::get<1>(r); return std::get<1>(l) > std::get<1>(r);
}); });