thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0774: "shellcmdline" doesn't work with getcompletion()

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

closes: #15834

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-10-10 19:14:13 +02:00
committed by Christian Brabandt
parent e58e9015cc
commit 85f36d61e0
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmdexpand.c
View File

@@ -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))