adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0705: Sorting of fuzzy filename completion is not stable

Browse Source 
Problem:  Sorting of fuzzy filename completion is not stable
Solution: Compare indexes when scores are equal.  Fix some typos.
          (zeertzjq)

closes: #15593

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-08-31 17:05:39 +02:00
committed by Christian Brabandt
parent 41ba26566f
commit 58d705238c
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/insexpand.c
View File

@ -3546,7 +3546,8 @@ static int compare_scores(const void *a, const void *b)
int idx_b = *(const int *)b;
int score_a = compl_fuzzy_scores[idx_a];
int score_b = compl_fuzzy_scores[idx_b];
return (score_a > score_b) ? -1 : (score_a < score_b) ? 1 : 0;
return score_a == score_b ? (idx_a == idx_b ? 0 : (idx_a < idx_b ? -1 : 1))
: (score_a > score_b ? -1 : 1);
}
/*

2
src/search.c
View File

@ -5217,7 +5217,7 @@ search_for_fuzzy_match(
{
pos_T current_pos = *pos;
pos_T circly_end;
int found_new_match = FAIL;
int found_new_match = FALSE;
int looped_around = FALSE;
if (whole_line)

2
src/testdir/dumps/Test_pum_highlights_15.dump
View File

@ -1,4 +1,4 @@
|/+0&#ffffff0|n|o|n|_|e|x|i|t|_|f|o|l|d|e|r> @58
|/+0&#ffffff0|n|o|n|_|e|x|i|s|t|i|n|g|_|f|o|l|d|e|r> @54
|~+0#4040ff13&| @73
|~| @73
|~| @73

2
src/testdir/test_popup.vim
View File

@ -1494,7 +1494,7 @@ func Test_pum_highlights_match()
call VerifyScreenDump(buf, 'Test_pum_highlights_11', {})
" issue #15357
call term_sendkeys(buf, "\<ESC>S/non_exit_folder\<C-X>\<C-F>")
call term_sendkeys(buf, "\<ESC>S/non_existing_folder\<C-X>\<C-F>")
call TermWait(buf, 50)
call VerifyScreenDump(buf, 'Test_pum_highlights_15', {})

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
705,
/**/
704,
/**/