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

Merge pull request #24036 from neovim/backport-24034-to-release-0.9

Browse Source 
[Backport release-0.9] vim-patch:9.0.1636: expanding a pattern interferes with cmdline completion
This commit is contained in:
zeertzjq
2023-06-16 07:18:06 +08:00
committed by GitHub
parent 0f121fea81 6ed84f8571
commit d9a76056bb
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/cmdexpand.c
View File

@@ -841,7 +841,7 @@ static char *find_longest_match(expand_T *xp, int options)
char *ExpandOne(expand_T *xp, char *str, char *orig, int options, int mode)
{
char *ss = NULL;
static int findex;
static int findex; // TODO(vim): Move into expand_T
static char *orig_save = NULL; // kept value of orig
int orig_saved = false;
@@ -871,7 +871,10 @@ char *ExpandOne(expand_T *xp, char *str, char *orig, int options, int mode)
cmdline_pum_remove();
}
}
findex = 0;
// TODO(vim): Remove condition if "findex" is part of expand_T ?
if (mode != WILD_EXPAND_FREE && mode != WILD_ALL && mode != WILD_ALL_KEEP) {
findex = 0;
}
if (mode == WILD_FREE) { // only release file name
return NULL;

30
test/old/testdir/test_cmdline.vim
View File

@@ -1253,6 +1253,30 @@ func Test_cmdline_complete_various()
call assert_equal('"py3file', @:)
endfunc
" Test that expanding a pattern doesn't interfere with cmdline completion.
func Test_expand_during_cmdline_completion()
func ExpandStuff()
badd <script>:p:h/README.*
call assert_equal(expand('<script>:p:h') .. '/README.txt', bufname('$'))
$bwipe
call assert_equal('README.txt', expand('README.*'))
call assert_equal(['README.txt'], getcompletion('README.*', 'file'))
endfunc
augroup test_CmdlineChanged
autocmd!
autocmd CmdlineChanged * call ExpandStuff()
augroup END
call feedkeys(":sign \<Tab>\<Tab>\<Tab>\<Tab>\<C-B>\"\<CR>", 'xt')
call assert_equal('"sign place', @:)
augroup test_CmdlineChanged
au!
augroup END
augroup! test_CmdlineChanged
delfunc ExpandStuff
endfunc
" Test for 'wildignorecase'
func Test_cmdline_wildignorecase()
CheckUnix
@@ -1792,6 +1816,7 @@ func Test_cmd_bang_E135()
augroup test_cmd_filter_E135
au!
augroup END
augroup! test_cmd_filter_E135
%bwipe!
endfunc
@@ -2280,7 +2305,7 @@ endfunc
func Test_cmd_map_cmdlineChanged()
let g:log = []
cnoremap <F1> l<Cmd><CR>s
augroup test
augroup test_CmdlineChanged
autocmd!
autocmd CmdlineChanged : let g:log += [getcmdline()]
augroup END
@@ -2296,9 +2321,10 @@ func Test_cmd_map_cmdlineChanged()
unlet g:log
cunmap <F1>
augroup test
augroup test_CmdlineChanged
autocmd!
augroup END
augroup! test_CmdlineChanged
endfunc
" Test for the 'suffixes' option