diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-08-27 06:44:13 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-08-27 07:03:07 +0800 |
| commit | 2676555b229feae462df32bf6dfce7f234b7be53 (patch) | |
| tree | fcf238602aedfcc8cca43f705a267037f5ee579d /src/nvim/syntax.c | |
| parent | cc2c8be481d3bb81ba8881097aa153bcbf64fa23 (diff) | |
| download | rneovim-2676555b229feae462df32bf6dfce7f234b7be53.tar.gz rneovim-2676555b229feae462df32bf6dfce7f234b7be53.tar.bz2 rneovim-2676555b229feae462df32bf6dfce7f234b7be53.zip | |
vim-patch:9.0.0283: cannot complete "syn list @cluster"
Problem: Cannot complete "syn list @cluster".
Solution: Recognize and handle "list @". (Björn Linse, closes vim/vim#10990)
https://github.com/vim/vim/commit/af9a6002e0761012cb7108cbfa179a880d3cb49b
Diffstat (limited to 'src/nvim/syntax.c')
| -rw-r--r-- | src/nvim/syntax.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index fe37a79a5b..de8d5ef638 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -5664,7 +5664,8 @@ static enum { EXP_SUBCMD, // expand ":syn" sub-commands EXP_CASE, // expand ":syn case" 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; /* @@ -5712,10 +5713,16 @@ void set_context_in_syntax_cmd(expand_T *xp, const char *arg) expand_what = EXP_SPELL; } else if (STRNICMP(arg, "sync", p - arg) == 0) { 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 || STRNICMP(arg, "region", p - arg) == 0 - || STRNICMP(arg, "match", p - arg) == 0 - || STRNICMP(arg, "list", p - arg) == 0) { + || STRNICMP(arg, "match", p - arg) == 0) { xp->xp_context = EXPAND_HIGHLIGHT; } else { 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) { +#define CBUFFER_LEN 256 + static char cbuffer[CBUFFER_LEN]; // TODO: better solution + switch (expand_what) { case EXP_SUBCMD: return subcommands[idx].name; @@ -5749,6 +5759,14 @@ char *get_syntax_name(expand_T *xp, int idx) "maxlines=", "minlines=", "region", NULL }; 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; } |