diff options
Diffstat (limited to 'syntax')
| -rw-r--r-- | syntax/basic/type.vim | 7 | ||||
| -rw-r--r-- | syntax/common.vim | 1 | ||||
| -rw-r--r-- | syntax/flow.vim | 6 | ||||
| -rw-r--r-- | syntax/go.vim | 15 | ||||
| -rw-r--r-- | syntax/javascript.vim | 4 | ||||
| -rw-r--r-- | syntax/meson.vim | 2 | ||||
| -rw-r--r-- | syntax/ocaml.vim | 13 | ||||
| -rw-r--r-- | syntax/opam.vim | 2 | ||||
| -rw-r--r-- | syntax/plantuml.vim | 18 | ||||
| -rw-r--r-- | syntax/terraform.vim | 38 | ||||
| -rw-r--r-- | syntax/zig.vim | 4 |
11 files changed, 75 insertions, 35 deletions
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim index bd1bdd1a..af2b535f 100644 --- a/syntax/basic/type.vim +++ b/syntax/basic/type.vim @@ -52,7 +52,8 @@ syntax cluster typescriptPrimaryType contains= \ typescriptTupleType, \ typescriptTypeQuery, \ typescriptStringLiteralType, - \ typescriptReadonlyArrayKeyword + \ typescriptReadonlyArrayKeyword, + \ typescriptAssertType syntax region typescriptStringLiteralType contained \ start=/\z(["']\)/ skip=/\\\\\|\\\z1\|\\\n/ end=/\z1\|$/ @@ -130,6 +131,10 @@ syntax keyword typescriptTypeQuery typeof keyof \ nextgroup=typescriptTypeReference \ contained skipwhite skipnl +syntax keyword typescriptAssertType asserts + \ nextgroup=typescriptTypeReference + \ contained skipwhite skipnl + syntax cluster typescriptCallSignature contains=typescriptGenericCall,typescriptCall syntax region typescriptGenericCall matchgroup=typescriptTypeBrackets \ start=/</ end=/>/ diff --git a/syntax/common.vim b/syntax/common.vim index 62e5bffd..cf0b7161 100644 --- a/syntax/common.vim +++ b/syntax/common.vim @@ -155,6 +155,7 @@ if exists("did_typescript_hilink") HiLink typescriptTypeReference Identifier HiLink typescriptConstructor Keyword HiLink typescriptDecorator Special + HiLink typescriptAssertType Keyword highlight link typeScript NONE diff --git a/syntax/flow.vim b/syntax/flow.vim new file mode 100644 index 00000000..ad4ba0a8 --- /dev/null +++ b/syntax/flow.vim @@ -0,0 +1,6 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 + +runtime syntax/javascript.vim +runtime extras/flow.vim + +endif diff --git a/syntax/go.vim b/syntax/go.vim index 5a23f24f..1d1cce13 100644 --- a/syntax/go.vim +++ b/syntax/go.vim @@ -166,13 +166,19 @@ syn match goSingleDecl /\%(import\|var\|const\) [^(]\@=/ contains=g " Integers syn match goDecimalInt "\<-\=\d\+\%([Ee][-+]\=\d\+\)\=\>" syn match goHexadecimalInt "\<-\=0[xX]\x\+\>" +syn match goHexadecimalError "\<-\=0[xX]\x*[^ \t0-9A-Fa-f]\S*\>" syn match goOctalInt "\<-\=0\o\+\>" -syn match goOctalError "\<-\=0\o*[89]\d*\>" +syn match goOctalError "\<-\=0[^XxBb]\o*[^ \t0-7]\S*\>" +syn match goBinaryInt "\<-\=0[bB][01]\+\>" +syn match goBinaryError "\<-\=0[bB][01]*[^ \t01]\S*\>" hi def link goDecimalInt Integer hi def link goHexadecimalInt Integer +hi def link goHexadecimalError Error hi def link goOctalInt Integer hi def link goOctalError Error +hi def link goBinaryInt Integer +hi def link goBinaryError Error hi def link Integer Number " Floating point @@ -384,6 +390,13 @@ hi def link goCoverageNormalText Comment function! s:hi() hi def link goSameId Search + hi def link goDiagnosticError SpellBad + hi def link goDiagnosticWarning SpellRare + + hi def link goDeclsFzfKeyword Keyword + hi def link goDeclsFzfFunction Function + hi def link goDeclsFzfSpecialComment SpecialComment + hi def link goDeclsFzfComment Comment " :GoCoverage commands hi def goCoverageCovered ctermfg=green guifg=#A6E22E diff --git a/syntax/javascript.vim b/syntax/javascript.vim index 388d02f9..29863ee1 100644 --- a/syntax/javascript.vim +++ b/syntax/javascript.vim @@ -112,7 +112,7 @@ syntax keyword jsAsyncKeyword async await syntax match jsSwitchColon contained /::\@!/ skipwhite skipempty nextgroup=jsSwitchBlock " Keywords -syntax keyword jsGlobalObjects Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set WeakSet RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch +syntax keyword jsGlobalObjects ArrayBuffer Array BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window syntax keyword jsGlobalNodeObjects module exports global process __dirname __filename syntax match jsGlobalNodeObjects /\<require\>/ containedin=jsFuncCall syntax keyword jsExceptions Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError @@ -152,7 +152,7 @@ syntax region jsSwitchBlock contained matchgroup=jsSwitchBraces s syntax region jsRepeatBlock contained matchgroup=jsRepeatBraces start=/{/ end=/}/ contains=@jsAll,jsBlock extend fold syntax region jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/ end=/}/ contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold syntax region jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsDestructuringNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold -syntax region jsObject contained matchgroup=jsObjectBraces start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold +syntax region jsObject contained matchgroup=jsObjectBraces start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword,jsTemplateString extend fold syntax region jsBlock matchgroup=jsBraces start=/{/ end=/}/ contains=@jsAll,jsSpreadExpression extend fold syntax region jsModuleGroup contained matchgroup=jsModuleBraces start=/{/ end=/}/ contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold syntax region jsSpreadExpression contained matchgroup=jsSpreadOperator start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression diff --git a/syntax/meson.vim b/syntax/meson.vim index d41eb06e..a84a08f1 100644 --- a/syntax/meson.vim +++ b/syntax/meson.vim @@ -30,7 +30,7 @@ endif " We need nocompatible mode in order to continue lines with backslashes. " Original setting will be restored. let s:cpo_save = &cpo -setlocal cpo&vim +set cpo&vim " http://mesonbuild.com/Syntax.html syn keyword mesonConditional elif else if endif diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim index 2058821e..6e6cf225 100644 --- a/syntax/ocaml.vim +++ b/syntax/ocaml.vim @@ -230,7 +230,18 @@ syn match ocamlStar "*" syn match ocamlAngle "<" syn match ocamlAngle ">" " Custom indexing operators: -syn match ocamlIndexingOp "\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\(()\|\[]\|{}\)\(<-\)\?" +syn region ocamlIndexing matchgroup=ocamlIndexingOp + \ start="\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\_s*(" + \ end=")\(\_s*<-\)\?" + \ contains=ALLBUT,@ocamlContained,ocamlParenErr +syn region ocamlIndexing matchgroup=ocamlIndexingOp + \ start="\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\_s*\[" + \ end="]\(\_s*<-\)\?" + \ contains=ALLBUT,@ocamlContained,ocamlBrackErr +syn region ocamlIndexing matchgroup=ocamlIndexingOp + \ start="\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\_s*{" + \ end="}\(\_s*<-\)\?" + \ contains=ALLBUT,@ocamlContained,ocamlBraceErr " Extension operators (has to be declared before regular infix operators): syn match ocamlExtensionOp "#[#~?!.:|&$%<=>@^*/+-]\+" " Infix and prefix operators: diff --git a/syntax/opam.vim b/syntax/opam.vim index d98dd0a7..a300b3b9 100644 --- a/syntax/opam.vim +++ b/syntax/opam.vim @@ -6,7 +6,7 @@ endif " need %{vars}% " env: [[CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]] -syn keyword opamKeyword1 remove depends depopts conflicts env packages patches version maintainer tags license homepage authors doc install author available name depexts substs synopsis description +syn keyword opamKeyword1 remove depends pin-depends depopts conflicts env packages patches version maintainer tags license homepage authors doc install author available name depexts substs synopsis description syn match opamKeyword2 "\v(bug-reports|post-messages|ocaml-version|opam-version|dev-repo|build-test|build-doc|build)" syn keyword opamTodo FIXME NOTE NOTES TODO XXX contained diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim index d6ac9af4..f3ebfaee 100644 --- a/syntax/plantuml.vim +++ b/syntax/plantuml.vim @@ -24,22 +24,28 @@ syntax match plantumlPreProc /\%(\%(^@start\|^@end\)\%(dot\|mindmap\|uml\|salt\| syntax region plantumlDir start=/\s\+/ms=s+1 end=/$/ contained " type +" From 'java - jar plantuml.jar - language' results {{{ syntax keyword plantumlTypeKeyword abstract actor agent archimate artifact boundary card cloud component control -syntax keyword plantumlTypeKeyword database diamond entity enum file folder frame node object robust concise package participant -syntax keyword plantumlTypeKeyword queue rectangle stack state storage usecase +syntax keyword plantumlTypeKeyword database detach diamond entity enum file folder frame node object package +syntax keyword plantumlTypeKeyword participant queue rectangle stack state storage usecase " class and interface are defined as plantumlClassKeyword syntax keyword plantumlClassKeyword class interface +"}}} +" Not in 'java - jar plantuml.jar - language' results +syntax keyword plantumlTypeKeyword concise robust " keyword -" Exclude 'top to bottom direction' +" From 'java - jar plantuml.jar - language' results {{{ +" Since "syntax keyword" can handle only words, "top to bottom direction" is excluded. 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 in at are to the and -syntax keyword plantumlKeyword legend endlegend link loop mainframe namespace newpage note of on opt order over package +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 +"}}} +" Not in 'java - jar plantuml.jar - language' results +syntax keyword plantumlKeyword endlegend split sprite then " 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 diff --git a/syntax/terraform.vim b/syntax/terraform.vim index 9efcfee0..e830c458 100644 --- a/syntax/terraform.vim +++ b/syntax/terraform.vim @@ -15,9 +15,6 @@ endif syn case match -syn keyword terraSection connection output provider variable data terraform locals -syn keyword terraValueBool true false on off yes no - """ data syn keyword terraDataTypeBI \ aci_access_port_block @@ -4443,39 +4440,38 @@ syn keyword terraResourceTypeBI \ yandex_vpc_subnet """ end resources +syn keyword terraSection connection output variable terraform locals +syn keyword terraValueBool true false on off yes no + syn keyword terraTodo contained TODO FIXME XXX BUG syn cluster terraCommentGroup contains=terraTodo syn region terraComment start="/\*" end="\*/" contains=@terraCommentGroup,@Spell syn region terraComment start="#" end="$" contains=@terraCommentGroup,@Spell syn region terraComment start="//" end="$" contains=@terraCommentGroup,@Spell -syn match terraResource /\<resource\>/ nextgroup=terraResourceTypeStr skipwhite -syn region terraResourceTypeStr start=/"/ end=/"/ contains=terraResourceTypeBI - \ nextgroup=terraResourceName skipwhite -syn region terraResourceName start=/"/ end=/"/ - \ nextgroup=terraResourceBlock skipwhite +syn keyword terraResource resource nextgroup=terraResourceTypeStr skipwhite +syn region terraResourceTypeStr start=/"/ end=/"/ contains=terraResourceTypeBI nextgroup=terraResourceName skipwhite +syn region terraResourceName start=/"/ end=/"/ nextgroup=terraResourceBlock skipwhite -syn match terraData /\<data\>/ nextgroup=terraDataTypeStr skipwhite -syn region terraDataTypeStr start=/"/ end=/"/ contains=terraDataTypeBI - \ nextgroup=terraDataName skipwhite -syn region terraDataName start=/"/ end=/"/ - \ nextgroup=terraDataBlock skipwhite +syn keyword terraData data nextgroup=terraDataTypeStr skipwhite +syn region terraDataTypeStr start=/"/ end=/"/ contains=terraDataTypeBI nextgroup=terraDataName skipwhite +syn region terraDataName start=/"/ end=/"/ nextgroup=terraDataBlock skipwhite """ provider -syn match terraProvider /\<provider\>/ nextgroup=terraProviderName skipwhite -syn region terraProviderName start=/"/ end=/"/ nextgroup=terraProviderBlock skipwhite +syn keyword terraProvider provider nextgroup=terraProviderName skipwhite +syn region terraProviderName start=/"/ end=/"/ nextgroup=terraProviderBlock skipwhite """ provisioner -syn match terraProvisioner /\<provisioner\>/ nextgroup=terraProvisionerName skipwhite -syn region terraProvisionerName start=/"/ end=/"/ nextgroup=terraProvisionerBlock skipwhite +syn keyword terraProvisioner provisioner nextgroup=terraProvisionerName skipwhite +syn region terraProvisionerName start=/"/ end=/"/ nextgroup=terraProvisionerBlock skipwhite """ module -syn match terraModule /\<module\>/ nextgroup=terraModuleName skipwhite -syn region terraModuleName start=/"/ end=/"/ nextgroup=terraModuleBlock skipwhite +syn keyword terraModule module nextgroup=terraModuleName skipwhite +syn region terraModuleName start=/"/ end=/"/ nextgroup=terraModuleBlock skipwhite """ dynamic (HCL2) -syn match terraDynamic /\<dynamic\>/ nextgroup=terraDynamicName skipwhite -syn region terraDynamicName start=/"/ end=/"/ nextgroup=terraDynamicBlock skipwhite +syn keyword terraDynamic dynamic nextgroup=terraDynamicName skipwhite +syn region terraDynamicName start=/"/ end=/"/ nextgroup=terraDynamicBlock skipwhite """ misc. syn match terraValueDec "\<[0-9]\+\([kKmMgG]b\?\)\?\>" diff --git a/syntax/zig.vim b/syntax/zig.vim index 29f72353..a0b8330a 100644 --- a/syntax/zig.vim +++ b/syntax/zig.vim @@ -36,7 +36,7 @@ syn match zigBuiltinFn "\v\@(compileLog|ctz|popCount|divExact|divFloor|divTrunc) syn match zigBuiltinFn "\v\@(embedFile|export|tagName|TagType|errorName)>" syn match zigBuiltinFn "\v\@(errorReturnTrace|fence|fieldParentPtr|field|unionInit)>" syn match zigBuiltinFn "\v\@(frameAddress|import|inlineCall|newStackCall|asyncCall|intToPtr|IntType)>" -syn match zigBuiltinFn "\v\@(maxValue|memberCount|memberName|memberType)>" +syn match zigBuiltinFn "\v\@(maxValue|memberCount|memberName|memberType|as)>" syn match zigBuiltinFn "\v\@(memcpy|memset|minValue|mod|mulWithOverflow|splat)>" syn match zigBuiltinFn "\v\@(noInlineCall|bitOffsetOf|byteOffsetOf|OpaqueType|panic|ptrCast)>" syn match zigBuiltinFn "\v\@(ptrToInt|rem|returnAddress|setCold|Type|shuffle)>" @@ -58,6 +58,8 @@ syn match zigCharacterInvalidUnicode display contained /b'\zs[^[:cntrl:][:graph: syn match zigCharacter /b'\([^\\]\|\\\(.\|x\x\{2}\)\)'/ contains=zigEscape,zigEscapeError,zigCharacterInvalid,zigCharacterInvalidUnicode syn match zigCharacter /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{6}\)\)'/ contains=zigEscape,zigEscapeUnicode,zigEscapeError,zigCharacterInvalid +syn region zigBlock start="{" end="}" transparent fold + syn region zigCommentLine start="//" end="$" contains=zigTodo,@Spell syn region zigCommentLineDoc start="////\@!" end="$" contains=zigTodo,@Spell |