Mercurial > vim
changeset 32796:e98fc0c439aa v9.0.1714
patch 9.0.1714: getcompletion() "cmdline" fails after :autocmd
Commit: https://github.com/vim/vim/commit/e4c79d36150431ffb97cb8952ec482af2e57f228
Author: zeertzjq <zeertzjq@outlook.com>
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 <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 15 Aug 2023 23:00:03 +0200 |
| parents | 4e591c4c4fe7 |
| children | d8aa1df4a387 |
| files | src/cmdexpand.c src/testdir/test_cmdline.vim src/usercmd.c src/version.c |
| diffstat | 4 files changed, 15 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -4017,9 +4017,10 @@ f_getcompletion(typval_T *argvars, typva 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 {
--- 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
--- 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);