From a3fdc8e226b15f237491e61fba141d7b4e7a4113 Mon Sep 17 00:00:00 2001 From: Kogia-sima Date: Sat, 18 Jul 2020 08:53:59 +0900 Subject: [PATCH] fix: Fix vim syntax highlighting * highlight sailfish tag inside html strings --- syntax/vim/syntax/sailfish.vim | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/syntax/vim/syntax/sailfish.vim b/syntax/vim/syntax/sailfish.vim index f13dbf6..ec05ffd 100644 --- a/syntax/vim/syntax/sailfish.vim +++ b/syntax/vim/syntax/sailfish.vim @@ -3,15 +3,19 @@ unlet b:current_syntax syn include @rustSyntax syntax/rust.vim -syn region sailfishCodeBlock matchgroup=sailfishTag start=/<%/ keepend end=/%>/ contains=@rustSyntax -syn region sailfishBufferBlock matchgroup=sailfishTag start=/<%=/ keepend end=/%>/ contains=@rustSyntax +syn region sailfishCodeBlock contained matchgroup=sailfishTag start=/<%/ keepend end=/%>/ contains=@rustSyntax +syn region sailfishBufferBlock contained matchgroup=sailfishTag start=/<%=/ keepend end=/%>/ contains=@rustSyntax syn region sailfishCommentBlock start=/<%#/ end=/%>/ " Redefine htmlTag so that it can contain jspExpr +syn clear htmlString +syn region htmlString contained start=+"+ end=+"+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,sailfishCodeBlock,sailfishBufferBlock +syn region htmlString contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,sailfishCodeBlock,sailfishBufferBlock + syn clear htmlTag syn region htmlTag start=+<[^/%]+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,sailfishBufferBlock -hi default link sailfishTag htmlTag +hi default link sailfishTag htmlPreProc hi default link sailfishCommentBlock htmlComment let b:current_syntax = "sailfish"