aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

Add completion for ":ownsyntax" and improve completion for ":filetype".

Browse Source 
(Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2010-07-29 20:59:59 +02:00
parent 8ada2cca0a
commit 1587a1e37d
6 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ex_getln.c
View File

@@ -4116,6 +4116,7 @@ addstar(fname, len, context)
if (context == EXPAND_HELP
|| context == EXPAND_COLORS
|| context == EXPAND_COMPILER
|| context == EXPAND_OWNSYNTAX
|| context == EXPAND_FILETYPE
|| (context == EXPAND_TAGS && fname[0] == '/'))
retval = vim_strnsave(fname, len);
@@ -4502,8 +4503,10 @@ ExpandFromContext(xp, pat, num_file, file, options)
return ExpandRTDir(pat, num_file, file, "colors");
if (xp->xp_context == EXPAND_COMPILER)
return ExpandRTDir(pat, num_file, file, "compiler");
if (xp->xp_context == EXPAND_FILETYPE)
if (xp->xp_context == EXPAND_OWNSYNTAX)
return ExpandRTDir(pat, num_file, file, "syntax");
if (xp->xp_context == EXPAND_FILETYPE)
return ExpandRTDir(pat, num_file, file, "{syntax,indent,ftplugin}");
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
if (xp->xp_context == EXPAND_USER_LIST)
return ExpandUserList(xp, num_file, file);
@@ -4944,14 +4947,16 @@ ExpandUserList(xp, num_file, file)
/*
* Expand color scheme, compiler or filetype names:
* 'runtimepath'/{dirname}/{pat}.vim
* 'runtimepath'/{dirnames}/{pat}.vim
* dirnames may contain one directory (ex: "colorscheme") or can be a glob
* expression matching multiple directories (ex: "{syntax,ftplugin,indent}").
*/
static int
ExpandRTDir(pat, num_file, file, dirname)
ExpandRTDir(pat, num_file, file, dirnames)
char_u *pat;
int *num_file;
char_u ***file;
char *dirname; /* "colors", "compiler" or "syntax" */
char *dirnames;
{
char_u *all;
char_u *s;
@@ -4960,10 +4965,10 @@ ExpandRTDir(pat, num_file, file, dirname)
*num_file = 0;
*file = NULL;
s = alloc((unsigned)(STRLEN(pat) + STRLEN(dirname) + 7));
s = alloc((unsigned)(STRLEN(pat) + STRLEN(dirnames) + 7));
if (s == NULL)
return FAIL;
sprintf((char *)s, "%s/%s*.vim", dirname, pat);
sprintf((char *)s, "%s/%s*.vim", dirnames, pat);
all = globpath(p_rtp, s, 0);
vim_free(s);
if (all == NULL)
@@ -4991,6 +4996,13 @@ ExpandRTDir(pat, num_file, file, dirname)
++e;
}
vim_free(all);
/* Sort and remove duplicates which can happen when specifying multiple
* directories in dirnames such as "{syntax,ftplugin,indent}".
*/
sort_strings((char_u **)ga.ga_data, ga.ga_len);
remove_duplicates(&ga);
*file = ga.ga_data;
*num_file = ga.ga_len;
return OK;