Mercurial > vim
diff src/ex_getln.c @ 8402:eed1ca42f9aa v7.4.1492
commit https://github.com/vim/vim/commit/35ca0e7a1cb6e6daef8e0052a8437801226cef19
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 5 17:41:49 2016 +0100
patch 7.4.1492
Problem: No command line completion for ":packadd".
Solution: Implement completion. (Hirohito Higashi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 05 Mar 2016 17:45:05 +0100 |
| parents | 74b15ed0a259 |
| children | 5d926807c19c |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -112,6 +112,7 @@ static int expand_showtail(expand_T *xp) #ifdef FEAT_CMDL_COMPL static int expand_shellcmd(char_u *filepat, int *num_file, char_u ***file, int flagsarg); static int ExpandRTDir(char_u *pat, int *num_file, char_u ***file, char *dirname[]); +static int ExpandPackAddDir(char_u *pat, int *num_file, char_u ***file); # ifdef FEAT_CMDHIST static char_u *get_history_arg(expand_T *xp, int idx); # endif @@ -4231,6 +4232,7 @@ addstar( || context == EXPAND_COMPILER || context == EXPAND_OWNSYNTAX || context == EXPAND_FILETYPE + || context == EXPAND_PACKADD || (context == EXPAND_TAGS && fname[0] == '/')) retval = vim_strnsave(fname, len); else @@ -4647,6 +4649,8 @@ ExpandFromContext( if (xp->xp_context == EXPAND_USER_LIST) return ExpandUserList(xp, num_file, file); # endif + if (xp->xp_context == EXPAND_PACKADD) + return ExpandPackAddDir(pat, num_file, file); regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0); if (regmatch.regprog == NULL) @@ -5180,6 +5184,58 @@ ExpandRTDir( return OK; } +/* + * Expand loadplugin names: + * 'packpath'/pack/ * /opt/{pat} + */ + static int +ExpandPackAddDir( + char_u *pat, + int *num_file, + char_u ***file) +{ + char_u *s; + char_u *e; + char_u *match; + garray_T ga; + int i; + int pat_len; + + *num_file = 0; + *file = NULL; + pat_len = (int)STRLEN(pat); + ga_init2(&ga, (int)sizeof(char *), 10); + + s = alloc((unsigned)(pat_len + 26)); + if (s == NULL) + { + ga_clear_strings(&ga); + return FAIL; + } + sprintf((char *)s, "pack/*/opt/%s*", pat); + globpath(p_pp, s, &ga, 0); + vim_free(s); + + for (i = 0; i < ga.ga_len; ++i) + { + match = ((char_u **)ga.ga_data)[i]; + s = gettail(match); + e = s + STRLEN(s); + mch_memmove(match, s, e - s + 1); + } + + if (ga.ga_len == 0) + return FAIL; + + /* Sort and remove duplicates which can happen when specifying multiple + * directories in dirnames. */ + remove_duplicates(&ga); + + *file = ga.ga_data; + *num_file = ga.ga_len; + return OK; +} + #endif #if defined(FEAT_CMDL_COMPL) || defined(FEAT_EVAL) || defined(PROTO)