IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0774: "shellcmdline" doesn't work with getcompletion() (#30750)

Browse Source 
Problem:  "shellcmdline" doesn't work with getcompletion().
Solution: Use set_context_for_wildcard_arg() (zeertzjq).

closes: vim/vim#15834

85f36d61e0
This commit is contained in:
zeertzjq 2024-10-11 06:48:45 +08:00 committed by GitHub
parent b3109084c2
commit 6f1601a1b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/doc/builtin.txt generated
View File

@ -3362,6 +3362,7 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()*
runtime |:runtime| completion runtime |:runtime| completion
scriptnames sourced script names |:scriptnames| scriptnames sourced script names |:scriptnames|
shellcmd Shell command shellcmd Shell command
shellcmdline Shell command line with filename arguments
sign |:sign| suboptions sign |:sign| suboptions
syntax syntax file names |'syntax'| syntax syntax file names |'syntax'|
syntime |:syntime| suboptions syntime |:syntime| suboptions

1
runtime/lua/vim/_meta/vimfn.lua generated
View File

@ -3008,6 +3008,7 @@ function vim.fn.getcmdwintype() end
--- runtime |:runtime| completion --- runtime |:runtime| completion
--- scriptnames sourced script names |:scriptnames| --- scriptnames sourced script names |:scriptnames|
--- shellcmd Shell command --- shellcmd Shell command
--- shellcmdline Shell command line with filename arguments
--- sign |:sign| suboptions --- sign |:sign| suboptions
--- syntax syntax file names |'syntax'| --- syntax syntax file names |'syntax'|
--- syntime |:syntime| suboptions --- syntime |:syntime| suboptions

8
src/nvim/cmdexpand.c
View File

@ -1529,7 +1529,8 @@ static void set_context_for_wildcard_arg(exarg_T *eap, const char *arg, bool use
xp->xp_context = EXPAND_FILES; xp->xp_context = EXPAND_FILES;
// For a shell command more chars need to be escaped. // For a shell command more chars need to be escaped.
if (usefilter || eap->cmdidx == CMD_bang || eap->cmdidx == CMD_terminal if (usefilter
|| (eap != NULL && (eap->cmdidx == CMD_bang || eap->cmdidx == CMD_terminal))
|| *complp == EXPAND_SHELLCMDLINE) { || *complp == EXPAND_SHELLCMDLINE) {
#ifndef BACKSLASH_IN_FILENAME #ifndef BACKSLASH_IN_FILENAME
xp->xp_shell = true; xp->xp_shell = true;
@ -3604,6 +3605,11 @@ void f_getcompletion(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
set_context_in_runtime_cmd(&xpc, xpc.xp_pattern); set_context_in_runtime_cmd(&xpc, xpc.xp_pattern);
xpc.xp_pattern_len = strlen(xpc.xp_pattern); xpc.xp_pattern_len = 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 = strlen(xpc.xp_pattern);
}
theend: theend:
if (xpc.xp_context == EXPAND_LUA) { if (xpc.xp_context == EXPAND_LUA) {

1
src/nvim/eval.lua
View File

@ -3775,6 +3775,7 @@ M.funcs = {
runtime |:runtime| completion runtime |:runtime| completion
scriptnames sourced script names |:scriptnames| scriptnames sourced script names |:scriptnames|
shellcmd Shell command shellcmd Shell command
shellcmdline Shell command line with filename arguments
sign |:sign| suboptions sign |:sign| suboptions
syntax syntax file names |'syntax'| syntax syntax file names |'syntax'|
syntime |:syntime| suboptions syntime |:syntime| suboptions

10
test/old/testdir/test_cmdline.vim
View File

@ -1032,6 +1032,8 @@ func Test_cmdline_complete_shellcmdline()
call feedkeys(":MyCmd whoam\<C-A>\<C-B>\"\<CR>", 'tx') call feedkeys(":MyCmd whoam\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_match('^".*\<whoami\>', @:) call assert_match('^".*\<whoami\>', @:)
let l = getcompletion('whoam', 'shellcmdline')
call assert_match('\<whoami\>', join(l, ' '))
delcommand MyCmd delcommand MyCmd
endfunc endfunc
@ -3818,9 +3820,13 @@ func Test_cmdline_complete_shellcmdline_argument()
call feedkeys(":MyCmd vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt') call feedkeys(":MyCmd vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
call assert_equal('"MyCmd vim test_cmdline.vim', @:) call assert_equal('"MyCmd vim test_cmdline.vim', @:)
call assert_equal(['test_cmdline.vim'],
\ getcompletion('vim test_cmdline.', 'shellcmdline'))
call feedkeys(":MyCmd vim nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt') call feedkeys(":MyCmd vim nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt')
call assert_equal('"MyCmd vim nonexistentfile', @:) call assert_equal('"MyCmd vim nonexistentfile', @:)
call assert_equal([],
\ getcompletion('vim nonexistentfile', 'shellcmdline'))
let compl1 = getcompletion('', 'file')[0] let compl1 = getcompletion('', 'file')[0]
let compl2 = getcompletion('', 'file')[1] let compl2 = getcompletion('', 'file')[1]
@ -3837,9 +3843,13 @@ func Test_cmdline_complete_shellcmdline_argument()
set wildoptions& set wildoptions&
call feedkeys(":MyCmd vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt') call feedkeys(":MyCmd vim test_cmdline.\<Tab>\<C-B>\"\<CR>", 'xt')
call assert_equal('"MyCmd vim test_cmdline.vim', @:) call assert_equal('"MyCmd vim test_cmdline.vim', @:)
call assert_equal(['test_cmdline.vim'],
\ getcompletion('vim test_cmdline.', 'shellcmdline'))
call feedkeys(":MyCmd vim nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt') call feedkeys(":MyCmd vim nonexistentfile\<Tab>\<C-B>\"\<CR>", 'xt')
call assert_equal('"MyCmd vim nonexistentfile', @:) call assert_equal('"MyCmd vim nonexistentfile', @:)
call assert_equal([],
\ getcompletion('vim nonexistentfile', 'shellcmdline'))
let compl1 = getcompletion('', 'file')[0] let compl1 = getcompletion('', 'file')[0]
let compl2 = getcompletion('', 'file')[1] let compl2 = getcompletion('', 'file')[1]