mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 17:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0283: cannot complete "syn list @cluster"

Browse Source 
Problem:    Cannot complete "syn list @cluster".
Solution:   Recognize and handle "list @". (Björn Linse, closes vim/vim#10990)
af9a6002e0
This commit is contained in:
zeertzjq
2022-08-27 06:44:13 +08:00
parent cc2c8be481
commit 2676555b22
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/syntax.c
View File

@@ -5665,6 +5665,7 @@ static enum {
EXP_CASE, // expand ":syn case" arguments EXP_CASE, // expand ":syn case" arguments
EXP_SPELL, // expand ":syn spell" arguments EXP_SPELL, // expand ":syn spell" arguments
EXP_SYNC, // expand ":syn sync" arguments EXP_SYNC, // expand ":syn sync" arguments
EXP_CLUSTER, // expand ":syn list @cluster" arguments
} expand_what; } expand_what;
/* /*
@@ -5712,10 +5713,16 @@ void set_context_in_syntax_cmd(expand_T *xp, const char *arg)
expand_what = EXP_SPELL; expand_what = EXP_SPELL;
} else if (STRNICMP(arg, "sync", p - arg) == 0) { } else if (STRNICMP(arg, "sync", p - arg) == 0) {
expand_what = EXP_SYNC; expand_what = EXP_SYNC;
} else if (STRNICMP(arg, "list", p - arg) == 0) {
p = skipwhite(p);
if (*p == '@') {
expand_what = EXP_CLUSTER;
} else {
xp->xp_context = EXPAND_HIGHLIGHT;
}
} else if (STRNICMP(arg, "keyword", p - arg) == 0 } else if (STRNICMP(arg, "keyword", p - arg) == 0
|| STRNICMP(arg, "region", p - arg) == 0 || STRNICMP(arg, "region", p - arg) == 0
|| STRNICMP(arg, "match", p - arg) == 0 || STRNICMP(arg, "match", p - arg) == 0) {
|| STRNICMP(arg, "list", p - arg) == 0) {
xp->xp_context = EXPAND_HIGHLIGHT; xp->xp_context = EXPAND_HIGHLIGHT;
} else { } else {
xp->xp_context = EXPAND_NOTHING; xp->xp_context = EXPAND_NOTHING;
@@ -5730,6 +5737,9 @@ void set_context_in_syntax_cmd(expand_T *xp, const char *arg)
*/ */
char *get_syntax_name(expand_T *xp, int idx) char *get_syntax_name(expand_T *xp, int idx)
{ {
#define CBUFFER_LEN 256
static char cbuffer[CBUFFER_LEN]; // TODO: better solution
switch (expand_what) { switch (expand_what) {
case EXP_SUBCMD: case EXP_SUBCMD:
return subcommands[idx].name; return subcommands[idx].name;
@@ -5749,6 +5759,14 @@ char *get_syntax_name(expand_T *xp, int idx)
"maxlines=", "minlines=", "region", NULL }; "maxlines=", "minlines=", "region", NULL };
return sync_args[idx]; return sync_args[idx];
} }
case EXP_CLUSTER:
if (idx < curwin->w_s->b_syn_clusters.ga_len) {
vim_snprintf(cbuffer, CBUFFER_LEN, "@%s",
SYN_CLSTR(curwin->w_s)[idx].scl_name);
return cbuffer;
} else {
return NULL;
}
} }
return NULL; return NULL;
} }

4
src/nvim/testdir/test_syntax.vim
View File

@@ -198,6 +198,10 @@ func Test_syntax_completion()
call feedkeys(":syn match \<C-A>\<C-B>\"\<CR>", 'tx') call feedkeys(":syn match \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_match('^"syn match @boolean @character ', @:) call assert_match('^"syn match @boolean @character ', @:)
syn cluster Aax contains=Aap
call feedkeys(":syn list @A\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_match('^"syn list @Aax', @:)
endfunc endfunc
func Test_echohl_completion() func Test_echohl_completion()