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.0.1714: getcompletion() "cmdline" fails after :autocmd

Browse Source 
Problem:  getcompletion() "cmdline" fails after :autocmd
Solution: Use set_cmd_context() instead of set_one_cmd_context().

closes: vim/vim#12804

e4c79d3615
(cherry picked from commit 05927f8058)
This commit is contained in:
zeertzjq
2023-08-16 05:31:37 +08:00
parent 4d6d4f8fbe
commit 7854874367
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/cmdexpand.c
View File

@@ -3481,7 +3481,6 @@ void wildmenu_cleanup(CmdlineInfo *cclp)
/// "getcompletion()" function
void f_getcompletion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
char *pat;
expand_T xpc;
bool filtered = false;
int options = WILD_SILENT | WILD_USE_NL | WILD_ADD_SLASH
@@ -3513,9 +3512,10 @@ void f_getcompletion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
const char *pattern = tv_get_string(&argvars[0]);
if (strcmp(type, "cmdline") == 0) {
set_one_cmd_context(&xpc, pattern);
const int cmdline_len = (int)strlen(pattern);
set_cmd_context(&xpc, (char *)pattern, cmdline_len, cmdline_len, false);
xpc.xp_pattern_len = strlen(xpc.xp_pattern);
xpc.xp_col = (int)strlen(pattern);
xpc.xp_col = cmdline_len;
goto theend;
}
@@ -3542,6 +3542,8 @@ void f_getcompletion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
}
theend:
;
char *pat;
if (cmdline_fuzzy_completion_supported(&xpc)) {
// when fuzzy matching, don't modify the search string
pat = xstrdup(xpc.xp_pattern);

3
src/nvim/usercmd.c
View File

@@ -295,9 +295,6 @@ const char *set_context_in_user_cmdarg(const char *cmd FUNC_ATTR_UNUSED, const c
return set_context_in_menu_cmd(xp, cmd, (char *)arg, forceit);
}
if (context == EXPAND_COMMANDS) {
if (xp->xp_context == EXPAND_NOTHING) {
xp->xp_context = context;
}
return arg;
}
if (context == EXPAND_MAPPINGS) {

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

@@ -601,6 +601,8 @@ func Test_getcompletion()
call assert_true(index(l, 'taglist(') >= 0)
let l = getcompletion('call paint', 'cmdline')
call assert_equal([], l)
let l = getcompletion('autocmd BufEnter * map <bu', 'cmdline')
call assert_equal(['<buffer>'], l)
func T(a, c, p)
let g:cmdline_compl_params = [a:a, a:c, a:p]
@@ -3637,14 +3639,15 @@ func Test_rulerformat_position()
call StopVimInTerminal(buf)
endfunc
func Test_usercmd_completion()
let g:complete=[]
func Test_getcompletion_usercmd()
command! -nargs=* -complete=command TestCompletion echo <q-args>
let g:complete = getcompletion('TestCompletion ', 'cmdline')
let a = getcompletion('', 'cmdline')
call assert_equal(a, g:complete)
call assert_equal(getcompletion('', 'cmdline'),
\ getcompletion('TestCompletion ', 'cmdline'))
call assert_equal(['<buffer>'],
\ getcompletion('TestCompletion map <bu', 'cmdline'))
delcom TestCompletion
unlet! g:complete
endfunc
" vim: shiftwidth=2 sts=2 expandtab