diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2020-04-25 21:03:34 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2020-04-25 21:03:34 +0200 |
| commit | 68b2748af117b56208f25678c4b465af00dc64c5 (patch) | |
| tree | f9038064b78513b3f99edb574cdd2943bd2fd633 /syntax | |
| parent | 14dc82fc4e6c0c08078f97a24a6c1639c1cc5113 (diff) | |
| download | vim-polyglot-68b2748af117b56208f25678c4b465af00dc64c5.tar.gz vim-polyglot-68b2748af117b56208f25678c4b465af00dc64c5.zip | |
Update
Diffstat (limited to 'syntax')
| -rw-r--r-- | syntax/basic/doc.vim | 3 | ||||
| -rw-r--r-- | syntax/common.vim | 1 | ||||
| -rw-r--r-- | syntax/crystal.vim | 2 | ||||
| -rw-r--r-- | syntax/julia.vim | 2 | ||||
| -rw-r--r-- | syntax/python.vim | 2 | ||||
| -rw-r--r-- | syntax/ruby.vim | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim index 44c94ef6..50f03e29 100644 --- a/syntax/basic/doc.vim +++ b/syntax/basic/doc.vim @@ -7,8 +7,9 @@ syntax match shellbang "^#!.*iojs\>" "JavaScript comments syntax keyword typescriptCommentTodo TODO FIXME XXX TBD +syntax match typescriptMagicComment "@ts-\%(ignore\|expect-error\)\>" syntax match typescriptLineComment "//.*" - \ contains=@Spell,typescriptCommentTodo,typescriptRef + \ contains=@Spell,typescriptCommentTodo,typescriptRef,typescriptMagicComment syntax region typescriptComment \ start="/\*" end="\*/" \ contains=@Spell,typescriptCommentTodo extend diff --git a/syntax/common.vim b/syntax/common.vim index fed39cf6..51900080 100644 --- a/syntax/common.vim +++ b/syntax/common.vim @@ -57,6 +57,7 @@ if exists("did_typescript_hilink") HiLink typescriptLineComment Comment HiLink typescriptDocComment Comment HiLink typescriptCommentTodo Todo + HiLink typescriptMagicComment SpecialComment HiLink typescriptRef Include HiLink typescriptDocNotation SpecialComment HiLink typescriptDocTags SpecialComment diff --git a/syntax/crystal.vim b/syntax/crystal.vim index e4b5403a..937361a8 100644 --- a/syntax/crystal.vim +++ b/syntax/crystal.vim @@ -486,6 +486,6 @@ let b:current_syntax = 'crystal' delc SynFold -" vim: nowrap sw=2 sts=2: +" vim: sw=2 sts=2 et: endif diff --git a/syntax/julia.vim b/syntax/julia.vim index 8727bde1..2dea6175 100644 --- a/syntax/julia.vim +++ b/syntax/julia.vim @@ -197,7 +197,7 @@ syntax match juliaConstGeneric display "\<\%(nothing\|Main\|undef\|missing\)\> syntax match juliaPossibleMacro transparent "@" contains=juliaMacroCall,juliaMacroCallP,juliaPrintfMacro exec 'syntax match juliaMacro contained "@' . s:idregex . '\%(\.' . s:idregex . '\)*"' -syntax match juliaMacro contained "@\.\ze[^0-9]" +syntax match juliaMacro contained "@[!.~$%^*/\\|<>+-]\ze[^0-9]" exec 'syntax region juliaMacroCall contained transparent start="\(@' . s:idregex . '\%(\.' . s:idregex . '\)*\)\@=\1\%([^(]\|$\)" end="\ze\%([])};#]\|$\|\<for\>\|\<end\>\)" contains=@juliaExpressions,juliaMacro,juliaSymbolS,juliaQuotedParBlockS' exec 'syntax region juliaMacroCall contained transparent start="\(@.\)\@=\1\%([^(]\|$\)" end="\ze\%([])};#]\|$\|\<for\>\|\<end\>\)" contains=@juliaExpressions,juliaMacro,juliaSymbolS,juliaQuotedParBlockS' exec 'syntax region juliaMacroCallP contained transparent start="@' . s:idregex . '\%(\.' . s:idregex . '\)*(" end=")\@'.s:d(1).'<=" contains=juliaMacro,juliaParBlock' diff --git a/syntax/python.vim b/syntax/python.vim index 101dbc2f..b6ea6529 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -58,8 +58,8 @@ endif if s:Enabled('g:python_highlight_builtins') call s:EnableByDefault('g:python_highlight_builtin_objs') - call s:EnableByDefault('g:python_highlight_builtin_funcs') call s:EnableByDefault('g:python_highlight_builtin_types') + call s:EnableByDefault('g:python_highlight_builtin_funcs') endif " diff --git a/syntax/ruby.vim b/syntax/ruby.vim index 5821749c..0a38ad8e 100644 --- a/syntax/ruby.vim +++ b/syntax/ruby.vim @@ -463,7 +463,7 @@ endif syn match rubyDefinedOperator "\%#=1\<defined?" display " 1.9-style Hash Keys and Keyword Parameters {{{1 -syn match rubySymbol "\%([{(|,]\_s*\)\@<=\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!]\=::\@!"he=e-1 +syn match rubySymbol "\%(\w\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!]\=::\@!"he=e-1 contained containedin=rubyBlockParameterList,rubyCurlyBlock syn match rubySymbol "[]})\"':]\@1<!\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],;]\@="he=e-1 syn match rubySymbol "[[:space:],{(]\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],;]\@="hs=s+1,he=e-1 |