diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/search.c | 58 |
1 files changed, 51 insertions, 7 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index 6e87b07d06..9f8ceae2a0 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -2973,6 +2973,10 @@ typedef struct { #define CAMEL_BONUS 30 /// bonus if the first letter is matched #define FIRST_LETTER_BONUS 15 +/// bonus if exact match +#define EXACT_MATCH_BONUS 100 +/// bonus if case match when no ignorecase +#define CASE_MATCH_BONUS 25 /// penalty applied for every letter in str before the first match #define LEADING_LETTER_PENALTY (-5) /// maximum penalty for leading letters @@ -2988,16 +2992,23 @@ typedef struct { /// Compute a score for a fuzzy matched string. The matching character locations /// are in "matches". -static int fuzzy_match_compute_score(const char *const str, const int strSz, - const uint32_t *const matches, const int numMatches) +static int fuzzy_match_compute_score(const char *const fuzpat, const char *const str, + const int strSz, const uint32_t *const matches, + const int numMatches) FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE { assert(numMatches > 0); // suppress clang "result of operation is garbage" const char *p = str; uint32_t sidx = 0; + bool is_exact_match = true; + const char *const orig_fuzpat = fuzpat - numMatches; + const char *curpat = orig_fuzpat; + int pat_idx = 0; + // Track consecutive camel case matches + int consecutive_camel = 0; + // Initialize score int score = 100; - bool is_exact_match = true; // Apply leading letter penalty int penalty = LEADING_LETTER_PENALTY * (int)matches[0]; @@ -3013,6 +3024,7 @@ static int fuzzy_match_compute_score(const char *const str, const int strSz, // Apply ordering bonuses for (int i = 0; i < numMatches; i++) { const uint32_t currIdx = matches[i]; + bool is_camel = false; if (i > 0) { const uint32_t prevIdx = matches[i - 1]; @@ -3022,9 +3034,12 @@ static int fuzzy_match_compute_score(const char *const str, const int strSz, score += SEQUENTIAL_BONUS; } else { score += GAP_PENALTY * (int)(currIdx - prevIdx); + // Reset consecutive camel count on gap + consecutive_camel = 0; } } + int curr; // Check for bonuses based on neighbor character value if (currIdx > 0) { // Camel case @@ -3035,10 +3050,19 @@ static int fuzzy_match_compute_score(const char *const str, const int strSz, MB_PTR_ADV(p); sidx++; } - const int curr = utf_ptr2char(p); + curr = utf_ptr2char(p); + // Enhanced camel case scoring if (mb_islower(neighbor) && mb_isupper(curr)) { - score += CAMEL_BONUS; + score += CAMEL_BONUS * 2; // Double the camel case bonus + is_camel = true; + consecutive_camel++; + // Additional bonus for consecutive camel + if (consecutive_camel > 1) { + score += CAMEL_BONUS; + } + } else { + consecutive_camel = 0; } // Bonus if the match follows a separator character @@ -3050,16 +3074,36 @@ static int fuzzy_match_compute_score(const char *const str, const int strSz, } else { // First letter score += FIRST_LETTER_BONUS; + curr = utf_ptr2char(p); + } + + // Case matching bonus + if (mb_isalpha(curr)) { + while (pat_idx < i && *curpat) { + MB_PTR_ADV(curpat); + pat_idx++; + } + + if (curr == utf_ptr2char(curpat)) { + score += CASE_MATCH_BONUS; + // Extra bonus for exact case match in camel + if (is_camel) { + score += CASE_MATCH_BONUS / 2; + } + } } + // Check exact match condition if (currIdx != (uint32_t)i) { is_exact_match = false; } } + // Boost score for exact matches if (is_exact_match && numMatches == strSz) { - score += 100; + score += EXACT_MATCH_BONUS; } + return score; } @@ -3138,7 +3182,7 @@ static int fuzzy_match_recursive(const char *fuzpat, const char *str, uint32_t s // Calculate score if (matched) { - *outScore = fuzzy_match_compute_score(strBegin, strLen, matches, nextMatch); + *outScore = fuzzy_match_compute_score(fuzpat, strBegin, strLen, matches, nextMatch); } // Return best result |