xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak RankedMatch, compare max match index instead of match indices sum

Browse Source
This commit is contained in:
Maxime Coste 2016-08-30 00:30:15 +01:00
parent cbe38b2f96
commit 2b631837d8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ranked_match.cc
View File

@ -70,9 +70,9 @@ static bool smartcase_eq(Codepoint query, Codepoint candidate)
return query == (islower(query) ? to_lower(candidate) : candidate); return query == (islower(query) ? to_lower(candidate) : candidate);
} }
static bool subsequence_match_smart_case(StringView str, StringView subseq, int& out_index_sum) static bool subsequence_match_smart_case(StringView str, StringView subseq, int& out_max_index)
{ {
int index_sum = 0; int max_index = 0;
auto it = str.begin(); auto it = str.begin();
int index = 0; int index = 0;
for (auto subseq_it = subseq.begin(); subseq_it != subseq.end();) for (auto subseq_it = subseq.begin(); subseq_it != subseq.end();)
@ -86,9 +86,9 @@ static bool subsequence_match_smart_case(StringView str, StringView subseq, int&
if (it == str.end()) if (it == str.end())
return false; return false;
} }
index_sum += index++; max_index = index++;
} }
out_index_sum = index_sum; out_max_index = max_index;
return true; return true;
} }
@ -100,7 +100,7 @@ RankedMatch::RankedMatch(StringView candidate, StringView query, TestFunc func)
if (query.empty()) if (query.empty())
m_candidate = candidate; m_candidate = candidate;
else if (func() and subsequence_match_smart_case(candidate, query, m_match_index_sum)) else if (func() and subsequence_match_smart_case(candidate, query, m_max_index))
{ {
m_candidate = candidate; m_candidate = candidate;
@ -143,8 +143,8 @@ bool RankedMatch::operator<(const RankedMatch& other) const
if (m_word_boundary_match_count != other.m_word_boundary_match_count) if (m_word_boundary_match_count != other.m_word_boundary_match_count)
return m_word_boundary_match_count > other.m_word_boundary_match_count; return m_word_boundary_match_count > other.m_word_boundary_match_count;
if (m_match_index_sum != other.m_match_index_sum) if (m_max_index != other.m_max_index)
return m_match_index_sum < other.m_match_index_sum; return m_max_index < other.m_max_index;
Utf8It it1{m_candidate.begin(), m_candidate}, it2{other.m_candidate.begin(), other.m_candidate}; Utf8It it1{m_candidate.begin(), m_candidate}, it2{other.m_candidate.begin(), other.m_candidate};
for (; it1 != m_candidate.end() and it2 != other.m_candidate.end(); ++it1, ++it2) for (; it1 != m_candidate.end() and it2 != other.m_candidate.end(); ++it1, ++it2)

2
src/ranked_match.hh
View File

@ -46,7 +46,7 @@ private:
StringView m_candidate; StringView m_candidate;
Flags m_flags = Flags::None; Flags m_flags = Flags::None;
int m_word_boundary_match_count = 0; int m_word_boundary_match_count = 0;
int m_match_index_sum = 0; int m_max_index = 0;
}; };
template<> struct WithBitOps<RankedMatch::Flags> : std::true_type {}; template<> struct WithBitOps<RankedMatch::Flags> : std::true_type {};