thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.1315: completion: issue with fuzzy completion and 'completefuzzycollect'

Browse Source 
Problem:  chain complete does not work when 'cot' includes fuzzy
          and 'completefuzzycollect' collects wrong next word.
          (Konfekt)
Solution: compl_startpos is not set correctly, remove next word check
          in search_for_fuzzy_match (glepnir).

fixes #17131
fixes #16942
closes: #17136

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
glepnir
2025-04-17 20:17:53 +02:00
committed by Christian Brabandt
parent 06fdfa11c5
commit cfe502c575
4 changed files with 16 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/testdir/test_ins_complete.vim
View File

@@ -3480,6 +3480,14 @@ func Test_complete_opt_fuzzy()
call feedkeys("Sb\<C-X>\<C-P>\<C-N>\<C-Y>\<ESC>", 'tx')
call assert_equal('b', getline('.'))
" chain completion
call feedkeys("Slore spum\<CR>lor\<C-X>\<C-P>\<C-X>\<C-P>\<ESC>", 'tx')
call assert_equal('lore spum', getline('.'))
" issue #15412
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('.'))
" clean up
set omnifunc=
bw!
@@ -3565,34 +3573,6 @@ func Test_complete_fuzzy_collect()
call feedkeys("Su\<C-X>\<C-L>\<C-P>\<Esc>0", 'tx!')
call assert_equal('no one can save me but you', getline('.'))
" issue #15412
call setline(1, ['alpha bravio charlie'])
call feedkeys("Salpha\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha bravio', getline('.'))
call feedkeys("Salp\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha', getline('.'))
call feedkeys("A\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha bravio', getline('.'))
call feedkeys("A\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha bravio charlie', getline('.'))
set complete-=i
call feedkeys("Salp\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha', getline('.'))
call feedkeys("A\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha bravio', getline('.'))
call feedkeys("A\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha bravio charlie', getline('.'))
call setline(1, ['alpha bravio charlie', 'alpha another'])
call feedkeys("Salpha\<C-X>\<C-N>\<C-N>\<Esc>0", 'tx!')
call assert_equal('alpha another', getline('.'))
call setline(1, ['你好 我好', '你好 他好'])
call feedkeys("S你好\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('你好 我好', getline('.'))
call feedkeys("S你好\<C-X>\<C-N>\<C-N>\<Esc>0", 'tx!')
call assert_equal('你好 他好', getline('.'))
" issue #15526
set completeopt=menuone,menu,noselect
call setline(1, ['Text', 'ToText', ''])
@@ -3618,6 +3598,11 @@ func Test_complete_fuzzy_collect()
call feedkeys("Gofuzzy\<C-X>\<C-N>\<C-N>\<C-N>\<C-Y>\<Esc>0", 'tx!')
call assert_equal('completefuzzycollect', getline('.'))
execute('%d _')
call setline(1, ['fuzzy', 'fuzzy foo', "fuzzy bar", 'fuzzycollect'])
call feedkeys("Gofuzzy\<C-X>\<C-N>\<C-N>\<C-N>\<C-Y>\<Esc>0", 'tx!')
call assert_equal('fuzzycollect', getline('.'))
bw!
bw!
set dict&