Mercurial > vim
changeset 21140:f86140ad0164 v8.2.1121
patch 8.2.1121: command completion not working after ++arg
Commit: https://github.com/vim/vim/commit/743d0620203388bf87dc611cea544b485e4b9f85
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jul 3 18:15:06 2020 +0200
patch 8.2.1121: command completion not working after ++arg
Problem: Command completion not working after ++arg.
Solution: Move skipping up. (Christian Brabandt, closes https://github.com/vim/vim/issues/6382)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 03 Jul 2020 18:30:03 +0200 |
| parents | d5c03e28c4b7 |
| children | d745abd682f9 |
| files | src/cmdexpand.c src/testdir/test_cmdline.vim src/version.c |
| diffstat | 3 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -1099,6 +1099,15 @@ set_one_cmd_context( arg = skipwhite(p); + // Skip over ++argopt argument + if ((ea.argt & EX_ARGOPT) && *arg != NUL && STRNCMP(arg, "++", 2) == 0) + { + p = arg; + while (*p && !vim_isspace(*p)) + MB_PTR_ADV(p); + arg = skipwhite(p); + } + if (ea.cmdidx == CMD_write || ea.cmdidx == CMD_update) { if (*arg == '>') // append @@ -1146,14 +1155,6 @@ set_one_cmd_context( arg = skipwhite(arg); } - // Skip over ++argopt argument - if ((ea.argt & EX_ARGOPT) && *arg != NUL && STRNCMP(arg, "++", 2) == 0) - { - p = arg; - while (*p && !vim_isspace(*p)) - MB_PTR_ADV(p); - arg = skipwhite(p); - } // Check for '|' to separate commands and '"' to start comments. // Don't do this for ":read !cmd" and ":write !cmd".
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1593,8 +1593,11 @@ func Test_read_shellcmd() call feedkeys(":r! ++enc=utf-8 r\<c-a>\<c-b>\"\<cr>", 'tx') call assert_notmatch('^"r!.*\<runtest.vim\>', @:) call assert_match('^"r!.*\<rm\>', @:) + + call feedkeys(":r ++enc=utf-8 !rm\<c-a>\<c-b>\"\<cr>", 'tx') + call assert_notmatch('^"r.*\<runtest.vim\>', @:) + call assert_match('^"r ++enc\S\+ !.*\<rm\>', @:) endif endfunc - " vim: shiftwidth=2 sts=2 expandtab