commit e91711eb79f1fd2b19c8bec80cb6ce73895bd414
parent 850aace4655253ec6faf36e907e22a2b2afea3a8
Author: Tinmarino <tinmarino@gmail.com>
Date: Sun, 10 Jan 2021 13:16:34 -0300
Test: Fix error in previous typeface hi
Diffstat:
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/test/syntax.vader b/test/syntax.vader
@@ -731,30 +731,29 @@ Given vimwiki (One line):
Execute (Assert highlight typeface 1):
" Typeface 1
- AssertEqual ['bold'], GetHighlightTerm('VimwikiBold', 'term')
- AssertEqual ['bold'], GetHighlightTerm('VimwikiBold', 'cterm')
- AssertEqual ['bold'], GetHighlightTerm('VimwikiBold', 'gui')
-
- AssertEqual ['italic'], GetHighlightTerm('VimwikiItalic', 'cterm')
- AssertEqual ['underline'], GetHighlightTerm('VimwikiUnderline', 'gui')
+ call AssertIfVersion(704, ['bold'], GetHighlightTerm('VimwikiBold', 'term'))
+ call AssertIfVersion(704, ['bold'], GetHighlightTerm('VimwikiBold', 'cterm'))
+ call AssertIfVersion(704, ['bold'], GetHighlightTerm('VimwikiBold', 'gui'))
+ call AssertIfVersion(704, ['italic'], GetHighlightTerm('VimwikiItalic', 'cterm'))
+ call AssertIfVersion(704, ['underline'], GetHighlightTerm('VimwikiUnderline', 'gui'))
Execute (Assert highlight typeface 2):
" Bold > Italic > Underline
- AssertEqual sort(['bold', 'italic', '1']), sort(add(GetHighlightTerm('VimwikiBoldItalic', 'gui'), '1'))
- AssertEqual sort(['bold', 'italic', '2']), sort(add(GetHighlightTerm('VimwikiBoldItalic', 'term'), '2'))
+ call AssertIfVersion(704, sort(['bold', 'italic', '1']), sort(add(GetHighlightTerm('VimwikiBoldItalic', 'gui'), '1')))
+ call AssertIfVersion(704, sort(['bold', 'italic', '2']), sort(add(GetHighlightTerm('VimwikiBoldItalic', 'term'), '2')))
- AssertEqual sort(['bold', 'underline', '3']), sort(add(GetHighlightTerm('VimwikiBoldUnderline', 'cterm'), '3'))
- AssertEqual sort(['bold', 'underline', '4']), sort(add(GetHighlightTerm('VimwikiUnderlineBold', 'term'), '4'))
+ call AssertIfVersion(704, sort(['bold', 'underline', '3']), sort(add(GetHighlightTerm('VimwikiBoldUnderline', 'cterm'), '3')))
+ call AssertIfVersion(704, sort(['bold', 'underline', '4']), sort(add(GetHighlightTerm('VimwikiUnderlineBold', 'term'), '4')))
- AssertEqual sort(['italic', 'underline', '5']), sort(add(GetHighlightTerm('VimwikiItalicUnderline', 'cterm'), '5'))
+ call AssertIfVersion(704, sort(['italic', 'underline', '5']), sort(add(GetHighlightTerm('VimwikiItalicUnderline', 'cterm'), '5')))
Execute (Assert highlight typeface 3):
- AssertEqual sort(['bold', 'italic', 'underline', '1']), sort(add(GetHighlightTerm('VimwikiBoldItalicUnderline', 'gui'), '1'))
- AssertEqual sort(['bold', 'italic', 'underline', '2']), sort(add(GetHighlightTerm('VimwikiBoldUnderlineItalic', 'cterm'), '2'))
- AssertEqual sort(['bold', 'italic', 'underline', '3']), sort(add(GetHighlightTerm('VimwikiItalicBoldUnderline', 'term'), '3'))
- AssertEqual sort(['bold', 'italic', 'underline', '4']), sort(add(GetHighlightTerm('VimwikiItalicUnderlineBold', 'gui'), '4'))
- AssertEqual sort(['bold', 'italic', 'underline', '5']), sort(add(GetHighlightTerm('VimwikiUnderlineBoldItalic', 'cterm'), '5'))
- AssertEqual sort(['bold', 'italic', 'underline', '6']), sort(add(GetHighlightTerm('VimwikiUnderlineItalicBold', 'term'), '6'))
+ call AssertIfVersion(704, sort(['bold', 'italic', 'underline', '1']), sort(add(GetHighlightTerm('VimwikiBoldItalicUnderline', 'gui'), '1')))
+ call AssertIfVersion(704, sort(['bold', 'italic', 'underline', '2']), sort(add(GetHighlightTerm('VimwikiBoldUnderlineItalic', 'cterm'), '2')))
+ call AssertIfVersion(704, sort(['bold', 'italic', 'underline', '3']), sort(add(GetHighlightTerm('VimwikiItalicBoldUnderline', 'term'), '3')))
+ call AssertIfVersion(704, sort(['bold', 'italic', 'underline', '4']), sort(add(GetHighlightTerm('VimwikiItalicUnderlineBold', 'gui'), '4')))
+ call AssertIfVersion(704, sort(['bold', 'italic', 'underline', '5']), sort(add(GetHighlightTerm('VimwikiUnderlineBoldItalic', 'cterm'), '5')))
+ call AssertIfVersion(704, sort(['bold', 'italic', 'underline', '6']), sort(add(GetHighlightTerm('VimwikiUnderlineItalicBold', 'term'), '6')))
Expect (One line):
content
diff --git a/test/vimrc b/test/vimrc
@@ -333,6 +333,10 @@
" Get output of `hi group`
" From: https://vi.stackexchange.com/a/12294/5026
" Return list ['bold','underline']
+ " Warning: must be called if version > 704
+ " Clause
+ if v:version < 704 | return [] | endif
+
" Store output of group to variable
let out = execute('hi ' . a:group)