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

vim-patch:9.1.1685: Missing changes from PR 18068 (#35482)

Browse Source 
Problem:  Missing changes from PR 18068
Solution: Include the missing changes
          (Girish Palya)

c6a0f42cdb

Co-authored-by: Girish Palya <girishji@gmail.com>
This commit is contained in:
zeertzjq
2025-08-26 07:24:21 +08:00
committed by GitHub
parent 516363e6ba
commit 821bfc02fb
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/insert.txt
View File

@@ -1126,8 +1126,8 @@ time slice.
This mode is fully compatible with other completion modes. You can invoke This mode is fully compatible with other completion modes. You can invoke
any of them at any time by typing |CTRL-X|, which temporarily suspends any of them at any time by typing |CTRL-X|, which temporarily suspends
autocompletion. To use |i_CTRL-N| specifically, press |CTRL-E| first to autocompletion. To use |i_CTRL-N| or |i_CTRL-X_CTRL-N| specifically, press
dismiss the popup menu (see |complete_CTRL-E|). |CTRL-E| first to dismiss the popup menu (see |complete_CTRL-E|).
See also 'autocomplete', 'autocompletetimeout' and 'autocompletedelay'. See also 'autocomplete', 'autocompletetimeout' and 'autocompletedelay'.

2
src/nvim/insexpand.c
View File

@@ -356,7 +356,7 @@ void ins_ctrl_x(void)
{ {
if (!ctrl_x_mode_cmdline()) { if (!ctrl_x_mode_cmdline()) {
// if the next ^X<> won't ADD nothing, then reset compl_cont_status // if the next ^X<> won't ADD nothing, then reset compl_cont_status
if ((compl_cont_status & CONT_N_ADDS) && !p_ac) { if (compl_cont_status & CONT_N_ADDS) {
compl_cont_status |= CONT_INTRPT; compl_cont_status |= CONT_INTRPT;
} else { } else {
compl_cont_status = 0; compl_cont_status = 0;

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

@@ -5311,7 +5311,7 @@ func Test_autocomplete_trigger()
" Test 4a: When autocomplete menu is active, ^X^N completes buffer keywords " Test 4a: When autocomplete menu is active, ^X^N completes buffer keywords
let g:CallCount = 0 let g:CallCount = 0
call feedkeys("S#a\<C-X>\<C-N>\<F2>\<Esc>0", 'tx!') call feedkeys("S#a\<C-E>\<C-X>\<C-N>\<F2>\<Esc>0", 'tx!')
call assert_equal(['abc', 'abcd'], b:matches->mapnew('v:val.word')) call assert_equal(['abc', 'abcd'], b:matches->mapnew('v:val.word'))
call assert_equal(2, g:CallCount) call assert_equal(2, g:CallCount)
@@ -5338,6 +5338,14 @@ func Test_autocomplete_trigger()
call assert_equal(['afoo bar', 'and'], b:matches->mapnew('v:val.word')) call assert_equal(['afoo bar', 'and'], b:matches->mapnew('v:val.word'))
call assert_equal(1, g:CallCount) call assert_equal(1, g:CallCount)
" Issue #18044
%d
call setline(1, ["first line", "second line"])
call feedkeys("Gof\<C-X>\<C-L>\<Esc>", 'tx!')
call assert_equal("first line", getline(3))
call feedkeys("Sf\<C-X>\<C-L>\<C-X>\<C-L>\<Esc>", 'tx!')
call assert_equal("second line", getline(4))
" Test 5: When invalid prefix stops completion, backspace should restart it " Test 5: When invalid prefix stops completion, backspace should restart it
%d %d
set complete& set complete&