patch 9.0.1714: getcompletion() "cmdline" fails after :autocmd
Commit:
https://github.com/vim/vim/commit/e4c79d36150431ffb97cb8952ec482af2e57f228
Author: zeertzjq <[email protected]>
Date: Tue Aug 15 22:41:53 2023 +0200
patch 9.0.1714: getcompletion() "cmdline" fails after :autocmd
Problem: getcompletion() "cmdline" fails after :autocmd
Solution: Use set_cmd_context() instead of set_one_cmd_context().
closes: #12804
Signed-off-by: Christian Brabandt <[email protected]>
Co-authored-by: zeertzjq <[email protected]>
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 09691066e..61532b91b 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -4017,9 +4017,10 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
ExpandInit(&xpc);
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_col = (int)STRLEN(pat);
+ xpc.xp_col = cmdline_len;
}
else
{
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index ba3af3c71..b5dec0695 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -612,6 +612,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]
@@ -3498,14 +3500,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
diff --git a/src/usercmd.c b/src/usercmd.c
index 6f4e10582..57435fafb 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -329,11 +329,7 @@ set_context_in_user_cmdarg(
return set_context_in_menu_cmd(xp, cmd, arg, forceit);
#endif
if (context == EXPAND_COMMANDS)
- {
- if (xp->xp_context == EXPAND_NOTHING)
- xp->xp_context = context;
return arg;
- }
if (context == EXPAND_MAPPINGS)
return set_context_in_map_cmd(xp, (char_u *)"map", arg, forceit, FALSE,
FALSE, CMD_map);
diff --git a/src/version.c b/src/version.c
index 15e692dd5..fa4516803 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1714,
/**/
1713,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qW191-003b2C-Ka%40256bit.org.
