Mercurial > vim
diff src/syntax.c @ 10624:5ac9d7920f11 v8.0.0201
patch 8.0.0201: completion of highlight groups includes cleared names
commit https://github.com/vim/vim/commit/d61e8aaae57bd66279def479462bf11c22ec2f1c
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 17 17:44:46 2017 +0100
patch 8.0.0201: completion of highlight groups includes cleared names
Problem: When completing a group name for a highlight or syntax command
cleared groups are included.
Solution: Skip groups that have been cleared.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 17 Jan 2017 17:45:04 +0100 |
| parents | 4ee16e5e2e26 |
| children | 16fc46021e51 |
line wrap: on
line diff
--- a/src/syntax.c +++ b/src/syntax.c @@ -22,6 +22,7 @@ struct hl_group { char_u *sg_name; /* highlight group name */ char_u *sg_name_u; /* uppercase of sg_name */ + int sg_cleared; /* "hi clear" was used */ /* for normal terminals */ int sg_term; /* "term=" highlighting attributes */ char_u *sg_start; /* terminal string for start highl */ @@ -7327,6 +7328,7 @@ do_highlight( #ifdef FEAT_EVAL HL_TABLE()[from_id - 1].sg_scriptID = current_SID; #endif + HL_TABLE()[from_id - 1].sg_cleared = FALSE; redraw_all_later(SOME_VALID); } } @@ -8034,6 +8036,7 @@ do_highlight( error = TRUE; break; } + HL_TABLE()[idx].sg_cleared = FALSE; /* * When highlighting has been given for a group, don't link it. @@ -8171,6 +8174,8 @@ hl_has_settings(int idx, int check_link) static void highlight_clear(int idx) { + HL_TABLE()[idx].sg_cleared = TRUE; + HL_TABLE()[idx].sg_term = 0; vim_free(HL_TABLE()[idx].sg_start); HL_TABLE()[idx].sg_start = NULL; @@ -9958,7 +9963,13 @@ get_highlight_name(expand_T *xp UNUSED, && include_link != 0) return (char_u *)"clear"; #endif - if (idx < 0 || idx >= highlight_ga.ga_len) + 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; + if (idx >= highlight_ga.ga_len) return NULL; return HL_TABLE()[idx].sg_name; }