diff options
Diffstat (limited to '')
| -rw-r--r-- | syntax/caddyfile.vim | 2 | ||||
| -rw-r--r-- | syntax/carp.vim | 21 | ||||
| -rw-r--r-- | syntax/elixir.vim | 4 | ||||
| -rw-r--r-- | syntax/go.vim | 14 | ||||
| -rw-r--r-- | syntax/julia.vim | 4 | ||||
| -rw-r--r-- | syntax/swift.vim | 3 | ||||
| -rw-r--r-- | syntax/terraform.vim | 2 | ||||
| -rw-r--r-- | syntax/typescript.vim | 10 |
8 files changed, 40 insertions, 20 deletions
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim index 17d95658..4c22b017 100644 --- a/syntax/caddyfile.vim +++ b/syntax/caddyfile.vim @@ -7,7 +7,7 @@ if exists("b:current_syntax") finish endif -syn match caddyDirective "^\s*\([a-z]\+\)" nextgroup=caddyDirectiveArgs skipwhite +syn match caddyDirective "^\s*\([a-zA-Z0-9_]\+\)" nextgroup=caddyDirectiveArgs skipwhite syn region caddyDirectiveArgs start="" end="\({\|#\|$\)"me=s-1 oneline contained contains=caddyPlaceholder,caddyString nextgroup=caddyDirectiveBlock skipwhite syn region caddyDirectiveBlock start="{" skip="\\}" end="}" contained contains=caddySubdirective,caddyComment diff --git a/syntax/carp.vim b/syntax/carp.vim index 13d96cd9..176c4d55 100644 --- a/syntax/carp.vim +++ b/syntax/carp.vim @@ -19,18 +19,33 @@ else endif syn keyword carpSyntax def defn let do if while ref address set! the -syn keyword carpSyntax defmacro defdynamic quote car cdr cons list array +syn keyword carpSyntax defmacro defdynamic quote cons list array syn keyword carpSyntax expand deftype register system-include register-type syn keyword carpSyntax defmodule copy use module defalias definterface eval syn keyword carpSyntax expand instantiate type info help quit env build run syn keyword carpSyntax cat use project-set! local-include system-include -syn keyword carpSyntax add-cflag add-lib project load reload +syn keyword carpSyntax add-cflag add-lib project load reload let-do ignore +syn keyword carpSyntax fmt mac-only linux-only windows-only use-all when +syn keyword carpSyntax unless defn-do comment forever-do case and* or* +syn keyword carpSyntax str* println* +syn match carpSyntax "\vc(a|d){1,4}r" -syn keyword carpFunc Int Float Double Bool String Char Array Fn Ref Long +syn keyword carpFunc Int Float Double Bool String Char Array Fn Ref Long λ syn keyword carpFunc not or and + - * / = /= >= <= > < inc dec syn keyword carpFunc println print get-line from-string mod seed random syn keyword carpFunc random-between str mask delete append count duplicate syn keyword carpFunc cstr chars from-chars to-int from-int sin cos sqrt acos +syn keyword carpFunc atan2 exit time srand for cond floor abs sort-with +syn keyword carpFunc subarray prefix-array suffix-array reverse sum min max +syn keyword carpFunc first last reduce format zero read-file bit-shift-left +syn keyword carpFunc bit-shift-right bit-and bit-or bit-xor bit-not safe-add +syn keyword carpFunc safe-sub safe-mul even? odd? cmp allocate repeat-indexed +syn keyword carpFunc sanitize-addresses memory-balance reset-memory-balance! +syn keyword carpFunc log-memory-balance! memory-logged assert-balanced trace +syn keyword carpFunc pi e swaop! update! char-at tail head split-by words lines +syn keyword carpFunc pad-left pad-right count-char empty? random-sized substring +syn keyword carpFunc prefix-string suffix-string starts-with? ends-with? +syn keyword carpFunc string-join free sleep-seconds sleep-micros syn keyword carpFunc atan2 exit time srand for cond floor abs neg to-float syn keyword carpFunc from-float tan asin atan cosh sinh tanh exp frexp ldexp syn keyword carpFunc log log10 modf pow ceil clamp approx refstr foreach diff --git a/syntax/elixir.vim b/syntax/elixir.vim index fa452609..f8faf487 100644 --- a/syntax/elixir.vim +++ b/syntax/elixir.vim @@ -143,6 +143,8 @@ syn region elixirDocString matchgroup=elixirSigilDelimiter start=+\%(@\w*doc\s\ " Defines syn match elixirDefine '\<def\>\(:\)\@!' nextgroup=elixirFunctionDeclaration skipwhite skipnl syn match elixirPrivateDefine '\<defp\>\(:\)\@!' nextgroup=elixirFunctionDeclaration skipwhite skipnl +syn match elixirGuard '\<defguard\>\(:\)\@!' nextgroup=elixirFunctionDeclaration skipwhite skipnl +syn match elixirPrivateGuard '\<defguardp\>\(:\)\@!' nextgroup=elixirFunctionDeclaration skipwhite skipnl syn match elixirModuleDefine '\<defmodule\>\(:\)\@!' nextgroup=elixirModuleDeclaration skipwhite skipnl syn match elixirProtocolDefine '\<defprotocol\>\(:\)\@!' nextgroup=elixirProtocolDeclaration skipwhite skipnl syn match elixirImplDefine '\<defimpl\>\(:\)\@!' nextgroup=elixirImplDeclaration skipwhite skipnl @@ -177,6 +179,8 @@ syn match elixirExUnitAssert "\(^\s*\)\@<=\<\(catch_exit\|catch_throw\|flunk\|r hi def link elixirBlockDefinition Keyword hi def link elixirDefine Define hi def link elixirPrivateDefine Define +hi def link elixirGuard Define +hi def link elixirPrivateGuard Define hi def link elixirModuleDefine Define hi def link elixirProtocolDefine Define hi def link elixirImplDefine Define diff --git a/syntax/go.vim b/syntax/go.vim index 4d5819ec..0705c3ee 100644 --- a/syntax/go.vim +++ b/syntax/go.vim @@ -44,8 +44,8 @@ if !exists("g:go_highlight_function_arguments") let g:go_highlight_function_arguments = 0 endif -if !exists("g:go_highlight_methods") - let g:go_highlight_methods = 0 +if !exists("g:go_highlight_function_calls") + let g:go_highlight_function_calls = 0 endif if !exists("g:go_highlight_fields") @@ -362,7 +362,6 @@ hi def link goOperator Operator " Functions; if g:go_highlight_functions isnot 0 || g:go_highlight_function_arguments isnot 0 - syn match goFunctionCall /\w\+\ze(/ contains=goBuiltins,goDeclaration syn match goDeclaration /\<func\>/ nextgroup=goReceiver,goFunction,goSimpleArguments skipwhite skipnl syn match goReceiverVar /\w\+\ze\s\+\(\w\|\*\)/ nextgroup=goPointerOperator,goReceiverType skipwhite skipnl contained syn match goPointerOperator /\*/ nextgroup=goReceiverType contained skipwhite skipnl @@ -381,13 +380,12 @@ else syn keyword goDeclaration func endif hi def link goFunction Function -hi def link goFunctionCall Type -" Methods; -if g:go_highlight_methods != 0 - syn match goMethodCall /\.\w\+\ze(/hs=s+1 +" Function calls; +if g:go_highlight_function_calls != 0 + syn match goFunctionCall /\w\+\ze(/ contains=goBuiltins,goDeclaration endif -hi def link goMethodCall Type +hi def link goFunctionCall Type " Fields; if g:go_highlight_fields != 0 diff --git a/syntax/julia.vim b/syntax/julia.vim index 3af7ecb2..e7bf145c 100644 --- a/syntax/julia.vim +++ b/syntax/julia.vim @@ -228,7 +228,7 @@ syntax match juliaBaseTypeSet display "\<Set\>" syntax match juliaBaseTypeSet0506 display "\<IntSet\>" syntax match juliaBaseTypeSet0607 display "\<AbstractSet\>" syntax match juliaBaseTypeSet07 display "\<\%(\%(Bit\|Key\)Set\|AbstractDict\)\>" -syntax match juliaBaseTypeIO display "\<\%(IO\%(Stream\|Buffer\|Context\)\?\|RawFD\|StatStruct\|DevNull\|FileMonitor\|PollingFileWatcher\|Timer\|Base64\%(Decode\|Encode\)Pipe\|\%(UDP\|TCP\)Socket\|\%(Abstract\)\?Channel\|BufferStream\|ReentrantLock\)\>" +syntax match juliaBaseTypeIO display "\<\%(IO\%(Stream\|Buffer\|Context\)\?\|RawFD\|StatStruct\|FileMonitor\|PollingFileWatcher\|Timer\|Base64\%(Decode\|Encode\)Pipe\|\%(UDP\|TCP\)Socket\|\%(Abstract\)\?Channel\|BufferStream\|ReentrantLock\)\>" syntax match juliaBaseTypeIO07 display "\<GenericIOBuffer\>" syntax match juliaBaseTypeProcess display "\<\%(ProcessGroup\|Pipe\|Cmd\)\>" syntax match juliaBaseTypeProcess0607 display "\<PipeBuffer\>" @@ -260,7 +260,7 @@ syntax match juliaPossibleEuler "ℯ" contains=juliaEuler exec 'syntax match juliaEuler contained "\%(\%(^\|[' . s:nonidS_chars . ']\|' . s:operators . '\)\%([.0-9eEf_]*\d\)\?\)\@'.s:d(80).'<=ℯ\ze\%($\|[' . s:nonidS_chars . ']\|' . s:operators . '\)"' syntax match juliaConstBool display "\<\%(true\|false\)\>" syntax match juliaConstEnv display "\<\%(ARGS\|ENV\|CPU_CORES\|OS_NAME\|ENDIAN_BOM\|LOAD_PATH\|VERSION\|JULIA_HOME\|PROGRAM_FILE\)\>" -syntax match juliaConstIO display "\<\%(STD\%(OUT\|IN\|ERR\)\)\>" +syntax match juliaConstIO display "\<\%(STD\%(OUT\|IN\|ERR\)\|DevNull\)\>" syntax match juliaConstC display "\<\%(WORD_SIZE\|C_NULL\)\>" syntax match juliaConstGeneric display "\<\%(nothing\|Main\)\>" syntax match juliaConstGeneric07 display "\<missing\>" diff --git a/syntax/swift.vim b/syntax/swift.vim index be8c7b47..ef592ce4 100644 --- a/syntax/swift.vim +++ b/syntax/swift.vim @@ -3,7 +3,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1 " File: swift.vim " Author: Keith Smiley " Description: Runtime files for Swift -" Last Modified: June 15, 2014 if exists("b:current_syntax") finish @@ -242,6 +241,8 @@ syntax keyword swiftPreprocessor \ #else \ #endif \ #selector + \ #warning + \ #error " Comment patterns diff --git a/syntax/terraform.vim b/syntax/terraform.vim index ba463913..5e25207f 100644 --- a/syntax/terraform.vim +++ b/syntax/terraform.vim @@ -9,7 +9,7 @@ endif syn case match -syn keyword terraSection connection output provider variable data terraform +syn keyword terraSection connection output provider variable data terraform locals syn keyword terraValueBool true false on off yes no """ data diff --git a/syntax/typescript.vim b/syntax/typescript.vim index 9e5d08be..144b72d4 100644 --- a/syntax/typescript.vim +++ b/syntax/typescript.vim @@ -47,8 +47,8 @@ if !exists("typescript_ignore_typescriptdoc") "unlet b:current_syntax syntax region typescriptDocComment start="/\*\*\s*$" end="\*/" contains=typescriptDocTags,typescriptCommentTodo,typescriptCvsTag,@typescriptHtml,@Spell fold extend - syntax match typescriptDocTags contained "@\(param\|argument\|requires\|exception\|throws\|type\|class\|extends\|see\|link\|member\|module\|method\|title\|namespace\|optional\|default\|base\|file\)\>" nextgroup=typescriptDocParam,typescriptDocSeeTag skipwhite - syntax match typescriptDocTags contained "@\(beta\|deprecated\|description\|fileoverview\|author\|license\|version\|returns\=\|constructor\|private\|protected\|final\|ignore\|addon\|exec\)\>" + syntax match typescriptDocTags contained "@\(param\|argument\|requires\|exception\|throws\|type\|class\|extends\|see\|link\|member\|module\|method\|title\|namespace\|optional\|default\|base\|file\|returns\=\)\>" nextgroup=typescriptDocParam,typescriptDocSeeTag skipwhite + syntax match typescriptDocTags contained "@\(beta\|deprecated\|description\|fileoverview\|author\|license\|version\|constructor\|private\|protected\|final\|ignore\|addon\|exec\)\>" syntax match typescriptDocParam contained "\%(#\|\w\|\.\|:\|\/\)\+" syntax region typescriptDocSeeTag contained matchgroup=typescriptDocSeeTag start="{" end="}" contains=typescriptDocTags @@ -67,14 +67,16 @@ syn region typescriptInterpolation matchgroup=typescriptInterpolationDelimiter \ start=/${/ end=/}/ contained \ contains=@typescriptExpression -syn match typescriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" +syn match typescriptNumber "-\=\<0[xX][0-9a-fA-F][0-9a-fA-F_]*\>" display +syn match typescriptNumber "-\=\<0[bB][01][01_]*\>" display +syn match typescriptNumber "-\=\<0[oO]\o[0-7_]*\>" display syn region typescriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline " syntax match typescriptSpecial "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\." " syntax region typescriptStringD start=+"+ skip=+\\\\\|\\$"+ end=+"+ contains=typescriptSpecial,@htmlPreproc " syntax region typescriptStringS start=+'+ skip=+\\\\\|\\$'+ end=+'+ contains=typescriptSpecial,@htmlPreproc " syntax region typescriptRegexpString start=+/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gim]\{,3}+ contains=typescriptSpecial,@htmlPreproc oneline " syntax match typescriptNumber /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/ -syntax match typescriptFloat /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/ +syntax match typescriptFloat /\<-\=\%(\d[0-9_]*\.\d[0-9_]*\|\d[0-9_]*\.\|\.\d[0-9]*\)\%([eE][+-]\=\d[0-9_]*\)\=\>/ " syntax match typescriptLabel /\(?\s*\)\@<!\<\w\+\(\s*:\)\@=/ syn match typescriptDecorators /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/ |