aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.1.1776: completion: "adding" expansion doesn't work with cfc=keyword

Browse Source 
Problem:  "adding" expansion doesn't work with cfc=keyword.
Solution: Remove incorrect assignment to compl_cont_status. Don't use
          fuzzy collection in "adding" status (zeertzjq).

related: neovim/neovim#35842
closes: #18351

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-09-20 14:12:14 +00:00
committed by Christian Brabandt
parent e39d35a44d
commit e19a882ffc
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/insexpand.c
View File

@@ -5005,8 +5005,9 @@ get_next_default_completion(ins_compl_next_state_T *st, pos_T *start_pos)
int looped_around = FALSE;
char_u *ptr = NULL;
int len = 0;
int in_fuzzy_collect = (cfc_has_mode() && compl_length > 0)
|| ((get_cot_flags() & COT_FUZZY) && compl_autocomplete);
int in_fuzzy_collect = !compl_status_adding()
&& ((cfc_has_mode() && compl_length > 0)
|| ((get_cot_flags() & COT_FUZZY) && compl_autocomplete));
char_u *leader = ins_compl_leader();
int score = FUZZY_SCORE_NONE;
int in_curbuf = st->ins_buf == curbuf;
@@ -7114,11 +7115,6 @@ ins_compl_start(void)
compl_col = curwin->w_cursor.col;
compl_lnum = curwin->w_cursor.lnum;
}
else if (ctrl_x_mode_normal() && cfc_has_mode())
{
compl_startpos = curwin->w_cursor;
compl_cont_status &= CONT_S_IPOS;
}
}
else
{

8
src/testdir/test_ins_complete.vim
View File

@@ -3607,6 +3607,14 @@ func Test_complete_fuzzy_collect()
call feedkeys("A\<C-X>\<C-N>\<C-N>\<Esc>0", 'tx!')
call assert_equal('你的 我的 我的', getline('.'))
" check that "adding" expansion works
call setline(1, ['hello world foo bar'])
call feedkeys("Ohlo\<C-X>\<C-N>\<C-X>\<C-N>\<C-X>\<C-N>\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('hello world foo bar', getline('.'))
call feedkeys("Swld\<C-X>\<C-N>\<C-X>\<C-N>\<C-X>\<C-N>\<Esc>0", 'tx!')
call assert_equal('world foo bar', getline('.'))
%delete
" fuzzy on file
call writefile([''], 'fobar', 'D')
call writefile([''], 'foobar', 'D')

2
src/version.c
View File

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