diff --git a/syntax/nomsu.vim b/syntax/nomsu.vim index 725c361..ea29b18 100644 --- a/syntax/nomsu.vim +++ b/syntax/nomsu.vim @@ -19,23 +19,23 @@ hi nomsuComment ctermfg=DarkBlue hi def link nomsuComment Comment -syn region nomsuList start=/\[/ end=/\]/ contains=@nomsuAll,nomsuComma +syn region nomsuList start=/\[/ end=/$\|\]/ contains=@nomsuAll,nomsuComma hi nomsuList ctermfg=Blue -syn region nomsuDict start=/{/ end=/}/ contains=nomsuColon,nomsuComma,@nomsuAll +syn region nomsuDict start=/{/ end=/$\|}/ contains=nomsuColon,nomsuComma,@nomsuAll hi nomsuDict ctermfg=Green -syn region nomsuParenGroup start=/(/ end=/)/ contains=@nomsuAll +syn region nomsuParenGroup start=/(/ end=/$\|)/ contains=@nomsuAll hi nomsuParenGroup ctermfg=Yellow syn match nomsuLongTextStart /"\.\."/ contains=nomsuIndentor contained hi nomsuLongTextStart ctermfg=Gray syn match nomsuTextBackslash /\\\\/ contained -hi nomsuTextBackslash ctermbg=Black ctermfg=Blue +hi nomsuTextBackslash ctermfg=Blue syn match nomsuTextEscapedQuote /\\"/ contained -hi nomsuTextEscapedQuote ctermbg=Black ctermfg=Blue -syn region nomsuInterp matchgroup=nomsuInterpDelim start=/\\(/ end=/)/ contained -\ contains=@nomsuAll +hi nomsuTextEscapedQuote ctermfg=Blue +syn match nomsuInterp /\\\([%[{"(]\)\@=/ nextgroup=nomsuVar,nomsuText,nomsuList,nomsuDict,nomsuParenGroup contained +hi nomsuInterp ctermfg=Brown syn region nomsuInterpDotDot matchgroup=nomsuInterpDelim start=/\\$/ end=/\.\./ contained syn region nomsuLongTextValue start=/^/ end=/$/ contained \ contains=nomsuInterp,nomsuInterpDotDot,nomsuTextBackslash @@ -57,7 +57,7 @@ hi def link nomsuVar Identifier syn match nomsuWord /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ hi def link nomsuWord Function hi nomsuWord ctermfg=White -syn match nomsuOpWord /\v[`$~!@^&*_+=|<>?'-]+/ +syn match nomsuOpWord ;\v[`$~!@^&*_+=|<>?'/-]+; hi def link nomsuOpWord Function hi nomsuOpWord ctermfg=LightYellow @@ -82,8 +82,8 @@ hi nomsuSemicolon ctermfg=Blue hi def link nomsuSemicolon Delimiter syn cluster nomsuAll contains=nomsuParenGroup,nomsuText,nomsuLongText,nomsuComment,nomsuOneLineComment, -\ nomsuVar,nomsuNumber,nomsuDict,nomsuList,nomsuColon,nomsuSemicolon,nomsuDotDot,nomsuWord, -\ nomsuOpWord +\ nomsuVar,nomsuNumber,nomsuDict,nomsuList,nomsuColon,nomsuSemicolon, +\ nomsuDotDot,nomsuWord,nomsuOpWord if !exists('b:current_syntax') let b:current_syntax = 'nomsu'