system/zsh
system/zsh
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh synced 2024-10-14 11:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

45108: ztst.vim: Conceal the '>' or '?' on pattern expected output / expected errput lines.

Browse source 
This aligns the expectations given by '*>' and '>' lines.
This commit is contained in:
Daniel Shahaf 2019-12-21 11:43:30 +00:00
parent 43761827f9
commit f906ba9d37
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2019-12-22 Daniel Shahaf <danielsh@apache.org>
* 45108: Test/ztst.vim: Conceal the '>' or '?' on pattern
expected output / expected errput lines.
* 45109: Test/B01cd.ztst, Test/ztst.vim, Util/zyodl.vim: Add
Vim highlighting file for Test/*.ztst files.

27
Test/ztst.vim
View file

@ -1,6 +1,8 @@
"" A Vim syntax highlighting file for Test/*.ztst
"
" See ../Util/zyodl.vim for installation instructions
" See ../Util/zyodl.vim for installation instructions.
" Also, it's recommended to 'setlocal conceallevel=3 concealcursor=nc'.
"
" See B01cd.ztst for cases we cover
" TODO: Some zsh syntax isn't highlighted, e.g., «{ cd $0 }» doesn't highlight either 'cd' or '$0'
@ -10,7 +12,6 @@
" I haven't found yet a legitimate use where they aren't highlighted, but
" they aren't highlighted in theoretical cases such as (( ++ZTST_skip )).
" (This example is theoretical because those variables are string-typed.)
" TODO: for glob-like output/errput lines, conceal the '>' or '?' to align them with adjacent lines.
"" Boilerplate:
if exists("b:current_syntax")
@ -33,11 +34,18 @@ syn region ztstTestName start=// end=/$/ contained
syn match ztstInputMarker /^</ nextgroup=ztstInput
syn region ztstInput start=// end=/$/ contained
syn match ztstOutputMarker /^[*]\?>/ nextgroup=ztstOutput contains=ztstPatternMarker
syn match ztstOutputPattern /^[*]>/ nextgroup=ztstOutput contains=ztstOutputPatternSigil,ztstOutputPatternMarker
syn match ztstOutputPatternSigil /[*]/ contained
syn match ztstOutputPatternMarker /[>]/ contained conceal
syn match ztstOutputLiteral /^>/ nextgroup=ztstOutput
syn region ztstOutput start=// end=/$/ contained
syn match ztstErrputMarker /^[*]\??/ nextgroup=ztstErrput contains=ztstPatternMarker
syn match ztstErrputPattern /^[*][?]/ nextgroup=ztstErrput contains=ztstErrputPatternSigil,ztstErrputPatternMarker
syn match ztstErrputPatternSigil /[*]/ contained
syn match ztstErrputPatternMarker /[?]/ contained conceal
syn match ztstErrputLiteral /^[?]/ nextgroup=ztstErrput
syn region ztstErrput start=// end=/$/ contained
syn match ztstPatternMarker /[*]/ contained
syn match ztstFrequentExplanationMarker /^F:/ nextgroup=ztstFrequentExplanation
syn region ztstFrequentExplanation start=// end=/$/ contained
@ -56,11 +64,14 @@ hi def link ztstTestName Title
hi def link ztstInput Normal
hi def link ztstInputMarker Ignore
hi def link ztstOutput String
hi def link ztstOutputMarker Ignore
hi def link ztstOutputPatternSigil Type
hi def link ztstOutputPatternMarker Ignore
hi def link ztstOutputLiteral Ignore
hi def link ztstErrput Identifier
hi def link ztstErrputMarker Ignore
hi def link ztstErrputPatternSigil Type
hi def link ztstErrputPatternMarker Ignore
hi def link ztstErrputLiteral Ignore
hi def link ztstDirective Statement
hi def link ztstPatternMarker Type
hi def link ztstComment Comment
hi def link ztstFrequentExplanation PreProc
hi def link ztstFrequentExplanationMarker Ignore