mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1475: completion: regression when "nearest" in 'completeopt' (#34607)

Browse Source 
Problem:  completion: regression when "nearest" in 'completeopt'
Solution: fix compare function (Girish Palya)

closes: vim/vim#17577

cd68f21f60

Co-authored-by: Girish Palya <girishji@gmail.com>
This commit is contained in:
zeertzjq
2025-06-23 07:56:47 +08:00
committed by GitHub
parent 30f650420b
commit 534ec8d447
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/insexpand.c
View File

@@ -1330,7 +1330,7 @@ static int cp_compare_nearest(const void *a, const void *b)
{ {
int score_a = ((compl_T *)a)->cp_score; int score_a = ((compl_T *)a)->cp_score;
int score_b = ((compl_T *)b)->cp_score; int score_b = ((compl_T *)b)->cp_score;
if (score_a < 0 || score_b < 0) { if (score_a == 0 || score_b == 0) {
return 0; return 0;
} }
return (score_a > score_b) ? 1 : (score_a < score_b) ? -1 : 0; return (score_a > score_b) ? 1 : (score_a < score_b) ? -1 : 0;

16
test/old/testdir/test_ins_complete.vim
View File

@@ -4573,6 +4573,22 @@ func Test_nearest_cpt_option()
exe "normal! of\<c-n>\<c-r>=PrintMenuWords()\<cr>" exe "normal! of\<c-n>\<c-r>=PrintMenuWords()\<cr>"
call assert_equal('f{''matches'': [''foo1'', ''foo3'', ''foo2''], ''selected'': -1}', getline(2)) call assert_equal('f{''matches'': [''foo1'', ''foo3'', ''foo2''], ''selected'': -1}', getline(2))
" Multiple sources
func F1(findstart, base)
if a:findstart
return col('.') - 1
endif
return ['foo4', 'foo5']
endfunc
%d
set complete+=FF1
call setline(1, ["foo1", "foo2", "bar1", "foo3"])
exe "normal! 2jof\<c-n>\<c-r>=PrintMenuWords()\<cr>"
call assert_equal('f{''matches'': [''foo3'', ''foo2'', ''foo1'', ''foo4'', ''foo5''],
\ ''selected'': -1}', getline(4))
set complete-=FF1
delfunc F1
set completeopt=menu,longest,nearest set completeopt=menu,longest,nearest
%d %d
call setline(1, ["fo", "foo", "foobar", "foobarbaz"]) call setline(1, ["fo", "foo", "foobar", "foobarbaz"])