aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

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: #12804

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
zeertzjq
2023-08-15 22:41:53 +02:00
committed by Christian Brabandt
parent ba913b14dd
commit e4c79d3615
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmdexpand.c
View File

@@ -4017,9 +4017,10 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
ExpandInit(&xpc); ExpandInit(&xpc);
if (STRCMP(type, "cmdline") == 0) if (STRCMP(type, "cmdline") == 0)
{ {
set_one_cmd_context(&xpc, pat); int cmdline_len = (int)STRLEN(pat);
set_cmd_context(&xpc, pat, cmdline_len, cmdline_len, FALSE);
xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
xpc.xp_col = (int)STRLEN(pat); xpc.xp_col = cmdline_len;
} }
else else
{ {

15
src/testdir/test_cmdline.vim
View File

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

4
src/usercmd.c
View File

@@ -329,11 +329,7 @@ set_context_in_user_cmdarg(
return set_context_in_menu_cmd(xp, cmd, arg, forceit); return set_context_in_menu_cmd(xp, cmd, arg, forceit);
#endif #endif
if (context == EXPAND_COMMANDS) if (context == EXPAND_COMMANDS)
{
if (xp->xp_context == EXPAND_NOTHING)
xp->xp_context = context;
return arg; return arg;
}
if (context == EXPAND_MAPPINGS) if (context == EXPAND_MAPPINGS)
return set_context_in_map_cmd(xp, (char_u *)"map", arg, forceit, FALSE, return set_context_in_map_cmd(xp, (char_u *)"map", arg, forceit, FALSE,
FALSE, CMD_map); FALSE, CMD_map);

2
src/version.c
View File

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