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

vim-patch:9.1.1381: completion: cannot return to original text (#33966)

Browse Source 
Problem:  Cannot return to the original text after selecting the next
          item when the currently selected item is the last one.
Solution: When continuing to move down past the last item, locate the
          original completion at the head/tail nodes of the completed
          linked list (glepnir).

closes: vim/vim#17300

5a18ccf490
This commit is contained in:
glepnir
2025-05-11 20:36:20 +08:00
committed by GitHub
parent 59c45b22d9
commit 4b3a9ac413
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/insexpand.c
View File

@@ -4414,9 +4414,8 @@ static compl_T *find_comp_when_fuzzy(void)
assert(compl_match_array != NULL); assert(compl_match_array != NULL);
if ((is_forward && compl_selected_item == compl_match_arraysize - 1) if ((is_forward && compl_selected_item == compl_match_arraysize - 1)
|| (is_backward && compl_selected_item == 0)) { || (is_backward && compl_selected_item == 0)) {
return compl_first_match != compl_shown_match return match_at_original_text(compl_first_match) ? compl_first_match
? (is_forward ? compl_shown_match->cp_next : compl_first_match) : compl_first_match->cp_prev;
: (compl_first_match->cp_prev ? compl_first_match->cp_prev : NULL);
} }
if (is_forward) { if (is_forward) {

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

@@ -2777,11 +2777,15 @@ func Test_complete_opt_fuzzy()
autocmd CompleteChanged * :call OnPumChange() autocmd CompleteChanged * :call OnPumChange()
augroup END augroup END
let g:change = 0
func Omni_test(findstart, base) func Omni_test(findstart, base)
if a:findstart if a:findstart
return col(".") return col(".")
endif endif
return [#{word: "foo"}, #{word: "foobar"}, #{word: "fooBaz"}, #{word: "foobala"}, #{word: "你好吗"}, #{word: "我好"}] if g:change == 0
return [#{word: "foo"}, #{word: "foobar"}, #{word: "fooBaz"}, #{word: "foobala"}, #{word: "你好吗"}, #{word: "我好"}]
endif
return [#{word: "for i = .."}, #{word: "bar"}, #{word: "foo"}, #{word: "for .. ipairs"}, #{word: "for .. pairs"}]
endfunc endfunc
new new
@@ -2878,6 +2882,15 @@ func Test_complete_opt_fuzzy()
call feedkeys("Salpha bravio charlie\<CR>alpha\<C-X>\<C-N>\<C-X>\<C-N>\<C-X>\<C-N>\<ESC>", 'tx') call feedkeys("Salpha bravio charlie\<CR>alpha\<C-X>\<C-N>\<C-X>\<C-N>\<C-X>\<C-N>\<ESC>", 'tx')
call assert_equal('alpha bravio charlie', getline('.')) call assert_equal('alpha bravio charlie', getline('.'))
set cot=fuzzy,menu,noinsert
call feedkeys(":let g:change=1\<CR>")
call feedkeys("S\<C-X>\<C-O>for\<C-N>\<C-N>\<C-N>", 'tx')
call assert_equal('for', getline('.'))
call feedkeys("S\<C-X>\<C-O>for\<C-P>", 'tx')
call assert_equal('for', getline('.'))
call feedkeys("S\<C-X>\<C-O>for\<C-P>\<C-P>", 'tx')
call assert_equal('for .. ipairs', getline('.'))
" clean up " clean up
set omnifunc= set omnifunc=
bw! bw!