diff options
Diffstat (limited to 'syntax')
| -rw-r--r-- | syntax/crystal.vim | 2 | ||||
| -rw-r--r-- | syntax/plantuml.vim | 23 | ||||
| -rw-r--r-- | syntax/rust.vim | 18 | ||||
| -rw-r--r-- | syntax/svelte.vim | 9 |
4 files changed, 26 insertions, 26 deletions
diff --git a/syntax/crystal.vim b/syntax/crystal.vim index edfd327e..8fdd2a6b 100644 --- a/syntax/crystal.vim +++ b/syntax/crystal.vim @@ -290,7 +290,7 @@ if !exists('g:crystal_no_special_methods') syn match crystalInclude "\<include\>[?!]\@!" display syn keyword crystalInclude extend require syn keyword crystalKeyword caller typeof pointerof sizeof instance_sizeof - syn match crystalRecord "\<record\>[?!]\@!" display + syn match crystalRecord "\<record\%(\s\+\u\w*\)\@=" display endif " Macro diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim index 7bcc9181..334cf5f8 100644 --- a/syntax/plantuml.vim +++ b/syntax/plantuml.vim @@ -20,7 +20,7 @@ let b:current_syntax = 'plantuml' syntax sync minlines=100 -syntax match plantumlPreProc /\%(\%(^@start\|^@end\)\%(dot\|mindmap\|uml\|salt\|wbs\)\)\|!\%(define\|definelong\|else\|enddefinelong\|endif\|exit\|if\|ifdef\|ifndef\|include\|pragma\|undef\)\s*.*/ contains=plantumlDir +syntax match plantumlPreProc /\%(\%(^@start\|^@end\)\%(dot\|mindmap\|uml\|salt\|wbs\|gantt\)\)\|!\%(define\|definelong\|else\|enddefinelong\|endif\|exit\|if\|ifdef\|ifndef\|include\|pragma\|undef\|gantt\)\s*.*/ contains=plantumlDir syntax region plantumlDir start=/\s\+/ms=s+1 end=/$/ contained " type @@ -34,12 +34,16 @@ syntax keyword plantumlClassKeyword class interface " Exclude 'top to bottom direction' syntax keyword plantumlKeyword accross activate again allow_mixing allowmixing also alt as autonumber bottom syntax keyword plantumlKeyword box break caption center create critical deactivate destroy down else elseif end -syntax keyword plantumlKeyword endif endwhile footbox footer fork group header hide hnote if is kill left +syntax keyword plantumlKeyword endif endwhile footbox footer fork group header hide hnote if is kill left in at are to the and syntax keyword plantumlKeyword legend link loop mainframe namespace newpage note of on opt order over package syntax keyword plantumlKeyword page par partition ref repeat return right rnote rotate show skin skinparam syntax keyword plantumlKeyword start stop title top up while " Not in 'java - jar plantuml.jar - language' output syntax keyword plantumlKeyword then detach split sprite +" gantt +syntax keyword plantumlTypeKeyword project monday tuesday wednesday thursday friday saturday sunday +syntax keyword plantumlKeyword starts ends start end closed day after colored lasts happens + syntax keyword plantumlCommentTODO XXX TODO FIXME NOTE contained syntax match plantumlColor /#[0-9A-Fa-f]\{6\}\>/ @@ -136,6 +140,7 @@ syntax region plantumlText oneline matchgroup=plantumlSequenceDelay start=/^\.\{ " Usecase diagram syntax match plantumlUsecaseActor /:.\{-1,}:/ contains=plantumlSpecialString + " Mindmap diagram let s:mindmapHilightLinks = [ \ 'WarningMsg', 'Directory', 'Special', 'MoreMsg', 'Statement', 'Title', @@ -143,18 +148,20 @@ let s:mindmapHilightLinks = [ \ 'Function', 'Todo' \ ] -syntax match plantumlMindmap1 /^[-+*][_<>]\?/ contained - let i = 1 let contained = [] while i < len(s:mindmapHilightLinks) - execute "syntax match plantumlMindmap" . i . " /^\\%(\\s\\|[-+*]\\)\\{" . (i - 1) . "}[-+*][_<>]\\?/ contained" - execute "highlight default link plantumlMindmap" . i . " " . s:mindmapHilightLinks[i - 1] - call add(contained, "plantumlMindmap" . i) + execute 'syntax match plantumlMindmap' . i . ' /^\([-+*]\)\1\{' . (i - 1) . '}_\?\s\+/ contained' + execute 'syntax match plantumlMindmap' . i . ' /^\s\{' . (i - 1) . '}\*_\?\s\+/ contained' + execute 'highlight default link plantumlMindmap' . i . ' ' . s:mindmapHilightLinks[i - 1] + call add(contained, 'plantumlMindmap' . i) let i = i + 1 endwhile -execute "syntax region plantumlMindmap oneline start=/^\\s*[-+*]_\\?/ end=/$/ contains=" . join(contained, ',') +execute 'syntax region plantumlMindmap oneline start=/^\([-+*]\)\1*_\?\s/ end=/$/ contains=' . join(contained, ',') +" Markdown syntax +execute 'syntax region plantumlMindmap oneline start=/^\s*\*_\?\s/ end=/$/ contains=' . join(contained, ',') + " Skinparam keywords syntax case ignore diff --git a/syntax/rust.vim b/syntax/rust.vim index e9f41d19..b61caa5f 100644 --- a/syntax/rust.vim +++ b/syntax/rust.vim @@ -36,7 +36,7 @@ syn match rustAssert "\<assert\(\w\)*!" contained syn match rustPanic "\<panic\(\w\)*!" contained syn match rustAsync "\<async\%(\s\|\n\)\@=" syn keyword rustKeyword break -syn keyword rustKeyword box nextgroup=rustBoxPlacement skipwhite skipempty +syn keyword rustKeyword box syn keyword rustKeyword continue syn keyword rustKeyword crate syn keyword rustKeyword extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite skipempty @@ -68,14 +68,6 @@ syn keyword rustObsoleteExternMod mod contained nextgroup=rustIdentifier skipw syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained -syn region rustBoxPlacement matchgroup=rustBoxPlacementParens start="(" end=")" contains=TOP contained -" Ideally we'd have syntax rules set up to match arbitrary expressions. Since -" we don't, we'll just define temporary contained rules to handle balancing -" delimiters. -syn region rustBoxPlacementBalance start="(" end=")" containedin=rustBoxPlacement transparent -syn region rustBoxPlacementBalance start="\[" end="\]" containedin=rustBoxPlacement transparent -" {} are handled by rustFoldBraces - syn region rustMacroRepeat matchgroup=rustMacroRepeatDelimiters start="$(" end=")" contains=TOP nextgroup=rustMacroRepeatCount syn match rustMacroRepeatCount ".\?[*+]" contained syn match rustMacroVariable "$\w\+" @@ -154,9 +146,9 @@ syn match rustEscapeError display contained /\\./ syn match rustEscape display contained /\\\([nrt0\\'"]\|x\x\{2}\)/ syn match rustEscapeUnicode display contained /\\u{\%(\x_*\)\{1,6}}/ syn match rustStringContinuation display contained /\\\n\s*/ -syn region rustString start=+b"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeError,rustStringContinuation -syn region rustString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustStringContinuation,@Spell -syn region rustString start='b\?r\z(#*\)"' end='"\z1' contains=@Spell +syn region rustString matchgroup=rustStringDelimiter start=+b"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeError,rustStringContinuation +syn region rustString matchgroup=rustStringDelimiter start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustStringContinuation,@Spell +syn region rustString matchgroup=rustStringDelimiter start='b\?r\z(#*\)"' end='"\z1' contains=@Spell " Match attributes with either arbitrary syntax or special highlighting for " derives. We still highlight strings and comments inside of the attribute. @@ -296,6 +288,7 @@ hi def link rustEscapeUnicode rustEscape hi def link rustEscapeError Error hi def link rustStringContinuation Special hi def link rustString String +hi def link rustStringDelimiter String hi def link rustCharacterInvalid Error hi def link rustCharacterInvalidUnicode rustCharacterInvalid hi def link rustCharacter Character @@ -352,7 +345,6 @@ hi def link rustLifetime Special hi def link rustLabel Label hi def link rustExternCrate rustKeyword hi def link rustObsoleteExternMod Error -hi def link rustBoxPlacementParens Delimiter hi def link rustQuestionMark Special hi def link rustAsync rustKeyword hi def link rustAwait rustKeyword diff --git a/syntax/svelte.vim b/syntax/svelte.vim index 373d8ac5..e4b5f27d 100644 --- a/syntax/svelte.vim +++ b/syntax/svelte.vim @@ -8,8 +8,8 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1 " URL: https://github.com/evanleck/vim-svelte " " Like vim-jsx, this depends on the pangloss/vim-javascript syntax package (and -" is tested against it exclusively). If you're using vim-polyglot (like I am), -" then you're all set. +" is tested against it exclusively). If you're using vim-polyglot, then you're +" all set. if exists("b:current_syntax") finish @@ -26,13 +26,14 @@ syntax match htmlTagName contained "\<[a-zA-Z:\.]*\>" " "bind:something", etc. syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag +" Mixed-case attributes are likely props. +syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag + " The "slot" attribute has special meaning. syntax keyword svelteKeyword slot contained containedin=htmlTag " According to vim-jsx, you can let jsBlock take care of ending the region. " https://github.com/mxw/vim-jsx/blob/master/after/syntax/jsx.vim -" -" ALLBUT,htmlSpecialTagName keeps Vim from marking CSS regions as jsBlock. syntax region svelteExpression start="{" end="" contains=jsBlock,javascriptBlock containedin=htmlString,htmlTag,htmlArg,htmlValue,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlHead,htmlTitle,htmlBoldItalicUnderline,htmlUnderlineBold,htmlUnderlineItalicBold,htmlUnderlineBoldItalic,htmlItalicUnderline,htmlItalicBold,htmlItalicBoldUnderline,htmlItalicUnderlineBold,htmlLink,htmlLeadingSpace,htmlBold,htmlBoldUnderline,htmlBoldItalic,htmlBoldUnderlineItalic,htmlUnderline,htmlUnderlineItalic,htmlItalic,htmlStrike,javaScript " Block conditionals. |