vim-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.

d61e8aaae5
This commit is contained in:
dvejmz
2018-01-08 21:37:12 +00:00
parent 889bc3c20c
commit 7f70c5f7b7
2 changed files with 58 additions and 6 deletions

View File

@@ -152,6 +152,12 @@ func Test_syntax_completion()
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', @:)
" Check that clearing "Aap" avoids it showing up before Boolean.
hi Aap ctermfg=blue
call feedkeys(":syn list \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_match('^"syn list Aap Boolean Character ', @:)
hi clear Aap
call feedkeys(":syn list \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_match('^"syn list Boolean Character ', @:)
@@ -188,11 +194,11 @@ func Test_syntax_arg_skipped()
syntax conceal off
call assert_match('conceal off', execute('syntax conceal'))
syntax region Tar start=/</ end=/>/
syntax region Bar start=/</ end=/>/
if 0
syntax region NotTest start=/</ end=/>/ contains=@Spell
endif
call assert_match('Tar', execute('syntax'))
call assert_match('Bar', execute('syntax'))
call assert_notmatch('NotTest', execute('syntax'))
call assert_notmatch('Spell', execute('syntax'))
@@ -202,6 +208,8 @@ func Test_syntax_arg_skipped()
syntax rest
endif
call assert_equal(a, execute('hi Foo'))
hi clear Bar
hi clear Foo
set ft=tags
syn off
@@ -283,8 +291,7 @@ func Test_syntax_arg_skipped()
endif
call assert_match('on C-style comments', execute('syntax sync'))
call assert_match('maximal 5 lines', execute('syntax sync'))
syn clear
syn keyword Foo foo
syn sync clear
if 0
syn sync ccomment
endif
@@ -292,3 +299,33 @@ func Test_syntax_arg_skipped()
syn clear
endfunc
func Test_invalid_arg()
call assert_fails('syntax case asdf', 'E390:')
call assert_fails('syntax conceal asdf', 'E390:')
call assert_fails('syntax spell asdf', 'E390:')
endfunc
func Test_syn_sync()
syntax region HereGroup start=/this/ end=/that/
syntax sync match SyncHere grouphere HereGroup "pattern"
call assert_match('SyncHere', execute('syntax sync'))
syn sync clear
call assert_notmatch('SyncHere', execute('syntax sync'))
syn clear
endfunc
func Test_syn_clear()
syntax keyword Foo foo
syntax keyword Bar tar
call assert_match('Foo', execute('syntax'))
call assert_match('Bar', execute('syntax'))
syn clear Foo
call assert_notmatch('Foo', execute('syntax'))
call assert_match('Bar', execute('syntax'))
syn clear Foo Bar
call assert_notmatch('Foo', execute('syntax'))
call assert_notmatch('Bar', execute('syntax'))
hi clear Foo
hi clear Bar
endfunc