Mercurial > vim
diff src/syntax.c @ 10660:715836a72361 v8.0.0220
patch 8.0.0220: completion of highlight names misses a few values
commit https://github.com/vim/vim/commit/15eedf1d621d980cb40f50cc6a78a09ab94388c7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 22 19:25:33 2017 +0100
patch 8.0.0220: completion of highlight names misses a few values
Problem: Completion for :match does not show "none" and other missing
highlight names.
Solution: Skip over cleared entries before checking the index to be at the
end.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 22 Jan 2017 19:30:03 +0100 |
| parents | 4f3decf25b7d |
| children | 5780bd3a5a7e |
line wrap: on
line diff
--- a/src/syntax.c +++ b/src/syntax.c @@ -9956,6 +9956,13 @@ highlight_list_two(int cnt, int attr) char_u * get_highlight_name(expand_T *xp UNUSED, int idx) { + 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; + #ifdef FEAT_CMDL_COMPL if (idx == highlight_ga.ga_len && include_none != 0) return (char_u *)"none"; @@ -9968,12 +9975,6 @@ get_highlight_name(expand_T *xp UNUSED, && include_link != 0) return (char_u *)"clear"; #endif - 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;