Mercurial > vim
changeset 11254:918942a3b0ef v8.0.0513
patch 8.0.0513: getting name of cleared highlight group is wrong
commit https://github.com/vim/vim/commit/c96272e30e2b81e5e0c8418f09d9db4e2fcd5d73
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 26 13:50:09 2017 +0200
patch 8.0.0513: getting name of cleared highlight group is wrong
Problem: Getting name of cleared highlight group is wrong. (Matt Wozniski)
Solution: Only skip over cleared names for completion. (closes https://github.com/vim/vim/issues/1592)
Also fix that a cleared group causes duplicate completions.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 26 Mar 2017 14:00:04 +0200 |
| parents | 370f2ba16782 |
| children | e89930ecb1ca |
| files | src/evalfunc.c src/ex_cmds.c src/proto/syntax.pro src/syntax.c src/testdir/test_cmdline.vim src/testdir/test_syntax.vim src/version.c |
| diffstat | 7 files changed, 32 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -11746,7 +11746,7 @@ f_synIDattr(typval_T *argvars UNUSED, ty break; case 'n': /* name */ - p = get_highlight_name(NULL, id - 1); + p = get_highlight_name_ext(NULL, id - 1, FALSE); break; case 'r': /* reverse */
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -7962,7 +7962,7 @@ sign_list_defined(sign_T *sp) if (sp->sn_line_hl > 0) { MSG_PUTS(" linehl="); - p = get_highlight_name(NULL, sp->sn_line_hl - 1); + p = get_highlight_name_ext(NULL, sp->sn_line_hl - 1, FALSE); if (p == NULL) MSG_PUTS("NONE"); else @@ -7971,7 +7971,7 @@ sign_list_defined(sign_T *sp) if (sp->sn_text_hl > 0) { MSG_PUTS(" texthl="); - p = get_highlight_name(NULL, sp->sn_text_hl - 1); + p = get_highlight_name_ext(NULL, sp->sn_text_hl - 1, FALSE); if (p == NULL) MSG_PUTS("NONE"); else
--- a/src/proto/syntax.pro +++ b/src/proto/syntax.pro @@ -52,5 +52,6 @@ void highlight_gui_started(void); int highlight_changed(void); void set_context_in_highlight_cmd(expand_T *xp, char_u *arg); char_u *get_highlight_name(expand_T *xp, int idx); +char_u *get_highlight_name_ext(expand_T *xp, int idx, int skip_cleared); void free_highlight_fonts(void); /* vim: set ft=c : */
--- a/src/syntax.c +++ b/src/syntax.c @@ -9949,17 +9949,27 @@ highlight_list_two(int cnt, int attr) || defined(FEAT_SIGNS) || defined(PROTO) /* * Function given to ExpandGeneric() to obtain the list of group names. - * Also used for synIDattr() function. */ char_u * get_highlight_name(expand_T *xp UNUSED, int idx) { + return get_highlight_name_ext(xp, idx, TRUE); +} + +/* + * Obtain a highlight group name. + * When "skip_cleared" is TRUE don't return a cleared entry. + */ + char_u * +get_highlight_name_ext(expand_T *xp UNUSED, int idx, int skip_cleared) +{ if (idx < 0) return NULL; - /* Items are never removed from the table, skip the ones that were cleared. - */ - while (idx < highlight_ga.ga_len && HL_TABLE()[idx].sg_cleared) - ++idx; + + /* Items are never removed from the table, skip the ones that were + * cleared. */ + if (skip_cleared && idx < highlight_ga.ga_len && HL_TABLE()[idx].sg_cleared) + return (char_u *)""; #ifdef FEAT_CMDL_COMPL if (idx == highlight_ga.ga_len && include_none != 0)
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -71,6 +71,14 @@ func Test_highlight_completion() call assert_equal('"hi default', getreg(':')) call feedkeys(":hi c\<S-Tab>\<Home>\"\<CR>", 'xt') call assert_equal('"hi clear', getreg(':')) + + " A cleared group does not show up in completions. + hi Anders ctermfg=green + call assert_equal(['Aardig', 'Anders'], getcompletion('A', 'highlight')) + hi clear Aardig + call assert_equal(['Anders'], getcompletion('A', 'highlight')) + hi clear Anders + call assert_equal([], getcompletion('A', 'highlight')) endfunc func Test_expr_completion()
--- a/src/testdir/test_syntax.vim +++ b/src/testdir/test_syntax.vim @@ -326,13 +326,16 @@ func Test_syn_clear() syntax keyword Bar tar call assert_match('Foo', execute('syntax')) call assert_match('Bar', execute('syntax')) + call assert_equal('Foo', synIDattr(hlID("Foo"), "name")) syn clear Foo call assert_notmatch('Foo', execute('syntax')) call assert_match('Bar', execute('syntax')) + call assert_equal('Foo', synIDattr(hlID("Foo"), "name")) syn clear Foo Bar call assert_notmatch('Foo', execute('syntax')) call assert_notmatch('Bar', execute('syntax')) hi clear Foo + call assert_equal('Foo', synIDattr(hlID("Foo"), "name")) hi clear Bar endfunc