From 85f36d61e09b12d6f1c60201129823371daa4a84 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 10 Oct 2024 19:14:13 +0200 Subject: [PATCH] patch 9.1.0774: "shellcmdline" doesn't work with getcompletion() Problem: "shellcmdline" doesn't work with getcompletion(). Solution: Use set_context_for_wildcard_arg() (zeertzjq). closes: #15834 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- runtime/doc/builtin.txt | 5 +++-- src/cmdexpand.c | 14 ++++++++++++-- src/testdir/test_cmdline.vim | 10 ++++++++++ src/version.c | 2 ++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 880dfcd785..44e9ee0196 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1,4 +1,4 @@ -*builtin.txt* For Vim version 9.1. Last change: 2024 Oct 08 +*builtin.txt* For Vim version 9.1. Last change: 2024 Oct 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4091,7 +4091,7 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()* cscope |:cscope| suboptions custom,{func} custom completion, defined via {func} customlist,{func} custom completion, defined via {func} - diff_buffer |:diffget| and |:diffput| completion + diff_buffer |:diffget| and |:diffput| completion dir directory names dir_in_path directory names in |'cdpath'| environment environment variable names @@ -4115,6 +4115,7 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()* runtime |:runtime| completion scriptnames sourced script names |:scriptnames| shellcmd Shell command + shellcmdline Shell command line with filename arguments sign |:sign| suboptions syntax syntax file names |'syntax'| syntime |:syntime| suboptions diff --git a/src/cmdexpand.c b/src/cmdexpand.c index e563d225f9..3f74f471b2 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -1721,7 +1721,7 @@ set_context_for_wildcard_arg( // characters that end the command and white space. else if (c == '|' || c == '\n' || c == '"' || (VIM_ISWHITE(c) #ifdef SPACE_IN_FILENAME - && (!(eap->argt & EX_NOSPC) || usefilter) + && (!(eap != NULL && (eap->argt & EX_NOSPC)) || usefilter) #endif )) { @@ -1756,7 +1756,10 @@ set_context_for_wildcard_arg( xp->xp_context = EXPAND_FILES; // For a shell command more chars need to be escaped. - if (usefilter || eap->cmdidx == CMD_bang || eap->cmdidx == CMD_terminal || *complp == EXPAND_SHELLCMDLINE) + if (usefilter + || (eap != NULL + && (eap->cmdidx == CMD_bang || eap->cmdidx == CMD_terminal)) + || *complp == EXPAND_SHELLCMDLINE) { #ifndef BACKSLASH_IN_FILENAME xp->xp_shell = TRUE; @@ -4208,6 +4211,13 @@ f_getcompletion(typval_T *argvars, typval_T *rettv) set_context_in_runtime_cmd(&xpc, xpc.xp_pattern); xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); } + if (xpc.xp_context == EXPAND_SHELLCMDLINE) + { + int context = EXPAND_SHELLCMDLINE; + set_context_for_wildcard_arg(NULL, xpc.xp_pattern, FALSE, &xpc, + &context); + xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); + } } if (cmdline_fuzzy_completion_supported(&xpc)) diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 418dafadcf..e1dbc87fe2 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1084,6 +1084,8 @@ func Test_cmdline_complete_shellcmdline() call feedkeys(":MyCmd whoam\\\"\", 'tx') call assert_match('^".*\', @:) + let l = getcompletion('whoam', 'shellcmdline') + call assert_match('\', join(l, ' ')) delcommand MyCmd endfunc @@ -3649,9 +3651,13 @@ func Test_cmdline_complete_shellcmdline_argument() call feedkeys(":MyCmd vim test_cmdline.\\\"\", 'xt') call assert_equal('"MyCmd vim test_cmdline.vim', @:) + call assert_equal(['test_cmdline.vim'], + \ getcompletion('vim test_cmdline.', 'shellcmdline')) call feedkeys(":MyCmd vim nonexistentfile\\\"\", 'xt') call assert_equal('"MyCmd vim nonexistentfile', @:) + call assert_equal([], + \ getcompletion('vim nonexistentfile', 'shellcmdline')) let compl1 = getcompletion('', 'file')[0] let compl2 = getcompletion('', 'file')[1] @@ -3668,9 +3674,13 @@ func Test_cmdline_complete_shellcmdline_argument() set wildoptions& call feedkeys(":MyCmd vim test_cmdline.\\\"\", 'xt') call assert_equal('"MyCmd vim test_cmdline.vim', @:) + call assert_equal(['test_cmdline.vim'], + \ getcompletion('vim test_cmdline.', 'shellcmdline')) call feedkeys(":MyCmd vim nonexistentfile\\\"\", 'xt') call assert_equal('"MyCmd vim nonexistentfile', @:) + call assert_equal([], + \ getcompletion('vim nonexistentfile', 'shellcmdline')) let compl1 = getcompletion('', 'file')[0] let compl2 = getcompletion('', 'file')[1] diff --git a/src/version.c b/src/version.c index 905daf90db..aa53d0ad31 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 774, /**/ 773, /**/