mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.0.1649: no completion for argument list commands
Problem: No completion for argument list commands. Solution: Add arglist completion. (Yegappan Lakshmanan, closes #2706)
This commit is contained in:
@@ -4469,6 +4469,7 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()*
|
||||
specifies what for. The following completion types are
|
||||
supported:
|
||||
|
||||
arglist file names in argument list
|
||||
augroup autocmd groups
|
||||
buffer buffer names
|
||||
behave :behave suboptions
|
||||
|
@@ -1272,6 +1272,7 @@ By default, the arguments of user defined commands do not undergo completion.
|
||||
However, by specifying one or the other of the following attributes, argument
|
||||
completion can be enabled:
|
||||
|
||||
-complete=arglist file names in argument list
|
||||
-complete=augroup autocmd groups
|
||||
-complete=buffer buffer names
|
||||
-complete=behave :behave suboptions
|
||||
|
@@ -3314,6 +3314,21 @@ alist_add_list(
|
||||
|
||||
#endif /* FEAT_LISTCMDS */
|
||||
|
||||
#if defined(FEAT_CMDL_COMPL) || defined(PROTO)
|
||||
/*
|
||||
* Function given to ExpandGeneric() to obtain the possible arguments of the
|
||||
* argedit and argdelete commands.
|
||||
*/
|
||||
char_u *
|
||||
get_arglist_name(expand_T *xp UNUSED, int idx)
|
||||
{
|
||||
if (idx >= ARGCOUNT)
|
||||
return NULL;
|
||||
|
||||
return alist_name(&ARGLIST[idx]);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_EVAL
|
||||
/*
|
||||
* ":compiler[!] {name}"
|
||||
|
@@ -4293,6 +4293,13 @@ set_one_cmd_context(
|
||||
break;
|
||||
#endif
|
||||
|
||||
case CMD_argdelete:
|
||||
while ((xp->xp_pattern = vim_strchr(arg, ' ')) != NULL)
|
||||
arg = xp->xp_pattern + 1;
|
||||
xp->xp_context = EXPAND_ARGLIST;
|
||||
xp->xp_pattern = arg;
|
||||
break;
|
||||
|
||||
#endif /* FEAT_CMDL_COMPL */
|
||||
|
||||
default:
|
||||
@@ -5879,6 +5886,7 @@ static struct
|
||||
char *name;
|
||||
} command_complete[] =
|
||||
{
|
||||
{EXPAND_ARGLIST, "arglist"},
|
||||
{EXPAND_AUGROUP, "augroup"},
|
||||
{EXPAND_BEHAVE, "behave"},
|
||||
{EXPAND_BUFFERS, "buffer"},
|
||||
|
@@ -4989,6 +4989,7 @@ ExpandFromContext(
|
||||
#endif
|
||||
{EXPAND_ENV_VARS, get_env_name, TRUE, TRUE},
|
||||
{EXPAND_USER, get_users, TRUE, FALSE},
|
||||
{EXPAND_ARGLIST, get_arglist_name, TRUE, FALSE},
|
||||
};
|
||||
int i;
|
||||
|
||||
|
@@ -67,6 +67,7 @@ void ex_argedit(exarg_T *eap);
|
||||
void ex_argadd(exarg_T *eap);
|
||||
void ex_argdelete(exarg_T *eap);
|
||||
void ex_listdo(exarg_T *eap);
|
||||
char_u *get_arglist_name(expand_T *xp, int idx);
|
||||
void ex_compiler(exarg_T *eap);
|
||||
void ex_runtime(exarg_T *eap);
|
||||
int do_in_path(char_u *path, char_u *name, int flags, void (*callback)(char_u *fname, void *ck), void *cookie);
|
||||
|
@@ -137,6 +137,11 @@ func Test_getcompletion()
|
||||
let l = getcompletion('v:notexists', 'var')
|
||||
call assert_equal([], l)
|
||||
|
||||
args a.c b.c
|
||||
let l = getcompletion('', 'arglist')
|
||||
call assert_equal(['a.c', 'b.c'], l)
|
||||
%argdelete
|
||||
|
||||
let l = getcompletion('', 'augroup')
|
||||
call assert_true(index(l, 'END') >= 0)
|
||||
let l = getcompletion('blahblah', 'augroup')
|
||||
|
@@ -766,6 +766,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1649,
|
||||
/**/
|
||||
1648,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user