Mercurial > vim
changeset 10534:1c6db35e3527 v8.0.0157
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 8 18:28:22 2017 +0100
patch 8.0.0157: no completion for :syntax spell and :syntax sync
Problem: No command line completion for ":syntax spell" and ":syntax sync".
Solution: Implement the completion. (Dominique Pelle)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 08 Jan 2017 18:30:03 +0100 |
parents | 7d09d23daaf7 |
children | 7eeebb3487d4 |
files | src/syntax.c src/testdir/test_syntax.vim src/version.c |
diffstat | 3 files changed, 40 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/syntax.c +++ b/src/syntax.c @@ -6383,7 +6383,9 @@ syntax_present(win_T *win) static enum { EXP_SUBCMD, /* expand ":syn" sub-commands */ - EXP_CASE /* expand ":syn case" arguments */ + EXP_CASE, /* expand ":syn case" arguments */ + EXP_SPELL, /* expand ":syn spell" arguments */ + EXP_SYNC /* expand ":syn sync" arguments */ } expand_what; /* @@ -6434,6 +6436,10 @@ set_context_in_syntax_cmd(expand_T *xp, xp->xp_context = EXPAND_NOTHING; else if (STRNICMP(arg, "case", p - arg) == 0) expand_what = EXP_CASE; + else if (STRNICMP(arg, "spell", p - arg) == 0) + expand_what = EXP_SPELL; + else if (STRNICMP(arg, "sync", p - arg) == 0) + expand_what = EXP_SYNC; else if ( STRNICMP(arg, "keyword", p - arg) == 0 || STRNICMP(arg, "region", p - arg) == 0 || STRNICMP(arg, "match", p - arg) == 0 @@ -6445,8 +6451,6 @@ set_context_in_syntax_cmd(expand_T *xp, } } -static char *(case_args[]) = {"match", "ignore", NULL}; - /* * Function given to ExpandGeneric() to obtain the list syntax names for * expansion. @@ -6454,9 +6458,31 @@ static char *(case_args[]) = {"match", " char_u * get_syntax_name(expand_T *xp UNUSED, int idx) { - if (expand_what == EXP_SUBCMD) - return (char_u *)subcommands[idx].name; - return (char_u *)case_args[idx]; + switch (expand_what) + { + case EXP_SUBCMD: + return (char_u *)subcommands[idx].name; + case EXP_CASE: + { + static char *case_args[] = {"match", "ignore", NULL}; + return (char_u *)case_args[idx]; + } + case EXP_SPELL: + { + static char *spell_args[] = + {"toplevel", "notoplevel", "default", NULL}; + return (char_u *)spell_args[idx]; + } + case EXP_SYNC: + { + static char *sync_args[] = + {"ccomment", "clear", "fromstart", + "linebreaks=", "linecont", "lines=", "match", + "maxlines=", "minlines=", "region", NULL}; + return (char_u *)sync_args[idx]; + } + } + return NULL; } #endif /* FEAT_CMDL_COMPL */
--- a/src/testdir/test_syntax.vim +++ b/src/testdir/test_syntax.vim @@ -150,6 +150,12 @@ func Test_syntax_completion() call feedkeys(":syn case \<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"syn case ignore match', @:) + call feedkeys(":syn spell \<C-A>\<C-B>\"\<CR>", 'tx') + call assert_equal('"syn spell default notoplevel toplevel', @:) + + call feedkeys(":syn sync \<C-A>\<C-B>\"\<CR>", 'tx') + call assert_equal('"syn sync ccomment clear fromstart linebreaks= linecont lines= match maxlines= minlines= region', @:) + call feedkeys(":syn list \<C-A>\<C-B>\"\<CR>", 'tx') call assert_match('^"syn list Boolean Character ', @:)