diff options
Diffstat (limited to '')
| -rw-r--r-- | syntax/basic/symbols.vim | 10 | ||||
| -rw-r--r-- | syntax/basic/type.vim | 5 | ||||
| -rw-r--r-- | syntax/common.vim | 1 | ||||
| -rw-r--r-- | syntax/crystal.vim | 96 | ||||
| -rw-r--r-- | syntax/dhall.vim | 2 | ||||
| -rw-r--r-- | syntax/plantuml.vim | 8 | ||||
| -rw-r--r-- | syntax/vifm.vim | 50 | 
7 files changed, 92 insertions, 80 deletions
| diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim index c4c025ac..2799ed39 100644 --- a/syntax/basic/symbols.vim +++ b/syntax/basic/symbols.vim @@ -16,10 +16,12 @@ syntax match   typescriptBinaryOp contained /===\?/ nextgroup=@typescriptValue s  syntax match   typescriptBinaryOp contained />\(>>=\|>>\|>=\|>\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty  " 4: <<=, <<, <=, <  syntax match   typescriptBinaryOp contained /<\(<=\|<\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty -" 3: ||, |=, | -syntax match   typescriptBinaryOp contained /|\(|\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty -" 3: &&, &=, & -syntax match   typescriptBinaryOp contained /&\(&\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty +" 3: ||, |=, |, ||= +syntax match   typescriptBinaryOp contained /||\?=\?/ nextgroup=@typescriptValue skipwhite skipempty +" 4: &&, &=, &, &&= +syntax match   typescriptBinaryOp contained /&&\?=\?/ nextgroup=@typescriptValue skipwhite skipempty +" 2: ??, ??= +syntax match   typescriptBinaryOp contained /??=\?/ nextgroup=@typescriptValue skipwhite skipempty  " 2: *=, *  syntax match   typescriptBinaryOp contained /\*=\?/ nextgroup=@typescriptValue skipwhite skipempty  " 2: %=, % diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim index ca7374a4..616c3271 100644 --- a/syntax/basic/type.vim +++ b/syntax/basic/type.vim @@ -94,9 +94,12 @@ syntax cluster typescriptTypeMember contains=    \ typescriptIndexSignature,    \ @typescriptMembers +syntax match typescriptTupleLable /\K\k*?\?:/ +    \ contained +  syntax region typescriptTupleType matchgroup=typescriptBraces    \ start=/\[/ end=/\]/ -  \ contains=@typescriptType,@typescriptComments +  \ contains=@typescriptType,@typescriptComments,typescriptRestOrSpread,typescriptTupleLable    \ contained skipwhite  syntax cluster typescriptTypeOperator diff --git a/syntax/common.vim b/syntax/common.vim index 6b451cec..11c71acf 100644 --- a/syntax/common.vim +++ b/syntax/common.vim @@ -101,6 +101,7 @@ if exists("did_typescript_hilink")    HiLink typescriptBoolean              Boolean    HiLink typescriptObjectLabel          typescriptLabel    HiLink typescriptLabel                Label +  HiLink typescriptTupleLable           Label    HiLink typescriptStringProperty       String    HiLink typescriptImport               Special    HiLink typescriptImportType           Special diff --git a/syntax/crystal.vim b/syntax/crystal.vim index 217cb6db..c3ed4c18 100644 --- a/syntax/crystal.vim +++ b/syntax/crystal.vim @@ -150,6 +150,7 @@ syn match  crystalModuleName       "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w  syn match  crystalStructName       "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@=" contained  syn match  crystalLibName          "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@=" contained  syn match  crystalEnumName         "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@=" contained +syn match  crystalAnnotationName   "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@=" contained  syn match  crystalConstant         "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@="  syn match  crystalClassVariable    "@@\%(\h\|%\|[^\x00-\x7F]\)\%(\w\|%\|[^\x00-\x7F]\)*" display  syn match  crystalInstanceVariable "@\%(\h\|%\|[^\x00-\x7F]\)\%(\w\|%\|[^\x00-\x7F]\)*" display @@ -247,53 +248,56 @@ SynFold '<<' syn region crystalString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\  SynFold '<<' syn region crystalString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<-`\z([^`]*\)`\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+3 matchgroup=crystalStringDelimiter end=+^\s*\zs\z1$+ contains=crystalHeredocStart,@crystalStringSpecial keepend  " Module, Class, Method, and Alias Declarations -syn match crystalAliasDeclaration    "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable nextgroup=crystalAliasDeclaration2 skipwhite -syn match crystalAliasDeclaration2   "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable -syn match crystalMethodDeclaration   "[^[:space:];#(]\+"   contained contains=crystalConstant,crystalFunction,crystalBoolean,crystalPseudoVariable,crystalInstanceVariable,crystalClassVariable,crystalGlobalVariable -syn match crystalFunctionDeclaration "[^[:space:];#(=]\+"  contained contains=crystalFunction -syn match crystalTypeDeclaration     "[^[:space:];#=]\+"   contained contains=crystalTypeName -syn match crystalClassDeclaration    "[^[:space:];#<]\+"   contained contains=crystalClassName,crystalOperator -syn match crystalModuleDeclaration   "[^[:space:];#]\+"    contained contains=crystalModuleName,crystalOperator -syn match crystalStructDeclaration   "[^[:space:];#<]\+"   contained contains=crystalStructName,crystalOperator -syn match crystalLibDeclaration      "[^[:space:];#]\+"    contained contains=crystalLibName,crystalOperator -syn match crystalMacroDeclaration    "[^[:space:];#(]\+"   contained contains=crystalFunction -syn match crystalEnumDeclaration     "[^[:space:];#<\"]\+" contained contains=crystalEnumName +syn match crystalAliasDeclaration      "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable nextgroup=crystalAliasDeclaration2 skipwhite +syn match crystalAliasDeclaration2     "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable +syn match crystalMethodDeclaration     "[^[:space:];#(]\+"   contained contains=crystalConstant,crystalFunction,crystalBoolean,crystalPseudoVariable,crystalInstanceVariable,crystalClassVariable,crystalGlobalVariable +syn match crystalFunctionDeclaration   "[^[:space:];#(=]\+"  contained contains=crystalFunction +syn match crystalTypeDeclaration       "[^[:space:];#=]\+"   contained contains=crystalTypeName +syn match crystalClassDeclaration      "[^[:space:];#<]\+"   contained contains=crystalClassName,crystalOperator +syn match crystalModuleDeclaration     "[^[:space:];#]\+"    contained contains=crystalModuleName,crystalOperator +syn match crystalStructDeclaration     "[^[:space:];#<]\+"   contained contains=crystalStructName,crystalOperator +syn match crystalLibDeclaration        "[^[:space:];#]\+"    contained contains=crystalLibName,crystalOperator +syn match crystalMacroDeclaration      "[^[:space:];#(]\+"   contained contains=crystalFunction +syn match crystalEnumDeclaration       "[^[:space:];#<\"]\+" contained contains=crystalEnumName +syn match crystalAnnotationDeclaration "[^[:space:];#]\+"    contained contains=crystalAnnotationName  syn match crystalFunction "\<[_[:alpha:]][_[:alnum:]]*[?!=]\=[[:alnum:]_.:?!=]\@!" contained containedin=crystalMethodDeclaration,crystalFunctionDeclaration  syn match crystalFunction "\%(\s\|^\)\@1<=[_[:alpha:]][_[:alnum:]]*[?!=]\=\%(\s\|$\)\@=" contained containedin=crystalAliasDeclaration,crystalAliasDeclaration2  syn match crystalFunction "\%([[:space:].]\|^\)\@1<=\%(\[\][=?]\=\|\*\*\|[+-]@\=\|[*/%|&^~]\|<<\|>>\|[<>]=\=\|<=>\|===\|[=!]=\|[=!]\~\|!\|`\)\%([[:space:];#(]\|$\)\@=" contained containedin=crystalAliasDeclaration,crystalAliasDeclaration2,crystalMethodDeclaration,crystalFunctionDeclaration -syn cluster crystalDeclaration contains=crystalAliasDeclaration,crystalAliasDeclaration2,crystalMethodDeclaration,crystalFunctionDeclaration,crystalModuleDeclaration,crystalClassDeclaration,crystalStructDeclaration,crystalLibDeclaration,crystalMacroDeclaration,crystalFunction,crystalBlockParameter,crystalTypeDeclaration,crystalEnumDeclaration +syn cluster crystalDeclaration contains=crystalAliasDeclaration,crystalAliasDeclaration2,crystalMethodDeclaration,crystalFunctionDeclaration,crystalModuleDeclaration,crystalClassDeclaration,crystalStructDeclaration,crystalLibDeclaration,crystalMacroDeclaration,crystalFunction,crystalBlockParameter,crystalTypeDeclaration,crystalEnumDeclaration,crystalAnnotationDeclaration  " Keywords  " Note: the following keywords have already been defined:  " begin case class def do end for if module unless until while  syn match crystalControl        "\<\%(break\|next\|rescue\|return\)\>[?!]\@!" -syn match crystalOperator       "\<defined?" display  syn match crystalKeyword        "\<\%(super\|previous_def\|yield\|of\|with\|uninitialized\|union\)\>[?!]\@!"  syn match crystalBoolean        "\<\%(true\|false\)\>[?!]\@!" -syn match crystalPseudoVariable "\<\%(nil\|self\|__DIR__\|__FILE__\|__LINE__\|__END_LINE__\)\>[?!]\@!" " TODO: reorganise +syn match crystalPseudoVariable "\<\%(nil\|__DIR__\|__FILE__\|__LINE__\|__END_LINE__\)\>[?!]\@!" " TODO: reorganise +syn match crystalPseudoVariable "\<self\>"  " Expensive Mode - match 'end' with the appropriate opening keyword for syntax  " based folding and special highlighting of module/class/method definitions  if !exists('b:crystal_no_expensive') && !exists('g:crystal_no_expensive') -  syn match crystalDefine "\<alias\>"  nextgroup=crystalAliasDeclaration skipwhite skipnl -  syn match crystalDefine "\<def\>"    nextgroup=crystalMethodDeclaration skipwhite skipnl -  syn match crystalDefine "\<fun\>"    nextgroup=crystalFunctionDeclaration skipwhite skipnl -  syn match crystalDefine "\<undef\>"  nextgroup=crystalFunction skipwhite skipnl -  syn match crystalDefine "\<\%(type\|alias\)\>\%(\s*\h\w*\s*=\)\@=" nextgroup=crystalTypeDeclaration skipwhite skipnl -  syn match crystalClass  "\<class\>"  nextgroup=crystalClassDeclaration skipwhite skipnl -  syn match crystalModule "\<module\>" nextgroup=crystalModuleDeclaration skipwhite skipnl -  syn match crystalStruct "\<struct\>" nextgroup=crystalStructDeclaration skipwhite skipnl -  syn match crystalLib    "\<lib\>"    nextgroup=crystalLibDeclaration skipwhite skipnl -  syn match crystalMacro  "\<macro\>"  nextgroup=crystalMacroDeclaration skipwhite skipnl -  syn match crystalEnum   "\<enum\>"   nextgroup=crystalEnumDeclaration skipwhite skipnl - -  SynFold 'def'    syn region crystalMethodBlock start="\<\%(def\|macro\)\>" matchgroup=crystalDefine end="\%(\<\%(def\|macro\)\_s\+\)\@<!\<end\>"  contains=TOP -  SynFold 'class'  syn region crystalBlock       start="\<class\>"           matchgroup=crystalClass  end="\<end\>"                                 contains=TOP -  SynFold 'module' syn region crystalBlock       start="\<module\>"          matchgroup=crystalModule end="\<end\>"                                 contains=TOP -  SynFold 'struct' syn region crystalBlock       start="\<struct\>"          matchgroup=crystalStruct end="\<end\>"                                 contains=TOP -  SynFold 'lib'    syn region crystalBlock       start="\<lib\>"             matchgroup=crystalLib    end="\<end\>"                                 contains=TOP -  SynFold 'enum'   syn region crystalBlock       start="\<enum\>"            matchgroup=crystalEnum   end="\<end\>"                                 contains=TOP +  syn match crystalDefine     "\<alias\>"      nextgroup=crystalAliasDeclaration skipwhite skipnl +  syn match crystalDefine     "\<def\>"        nextgroup=crystalMethodDeclaration skipwhite skipnl +  syn match crystalDefine     "\<fun\>"        nextgroup=crystalFunctionDeclaration skipwhite skipnl +  syn match crystalDefine     "\<undef\>"      nextgroup=crystalFunction skipwhite skipnl +  syn match crystalDefine     "\<\%(type\|alias\)\>\%(\s*\h\w*\s*=\)\@=" nextgroup=crystalTypeDeclaration skipwhite skipnl +  syn match crystalClass      "\<class\>"      nextgroup=crystalClassDeclaration skipwhite skipnl +  syn match crystalModule     "\<module\>"     nextgroup=crystalModuleDeclaration skipwhite skipnl +  syn match crystalStruct     "\<struct\>"     nextgroup=crystalStructDeclaration skipwhite skipnl +  syn match crystalLib        "\<lib\>"        nextgroup=crystalLibDeclaration skipwhite skipnl +  syn match crystalMacro      "\<macro\>"      nextgroup=crystalMacroDeclaration skipwhite skipnl +  syn match crystalEnum       "\<enum\>"       nextgroup=crystalEnumDeclaration skipwhite skipnl +  syn match crystalAnnotation "\<annotation\>" nextgroup=crystalAnnotationDeclaration skipwhite skipnl + +  SynFold 'def'        syn region crystalMethodBlock start="\<\%(def\|macro\)\>" matchgroup=crystalDefine     end="\%(\<\%(def\|macro\)\_s\+\)\@<!\<end\>"  contains=TOP +  SynFold 'class'      syn region crystalBlock       start="\<class\>"           matchgroup=crystalClass      end="\<end\>"                                 contains=TOP +  SynFold 'module'     syn region crystalBlock       start="\<module\>"          matchgroup=crystalModule     end="\<end\>"                                 contains=TOP +  SynFold 'struct'     syn region crystalBlock       start="\<struct\>"          matchgroup=crystalStruct     end="\<end\>"                                 contains=TOP +  SynFold 'lib'        syn region crystalBlock       start="\<lib\>"             matchgroup=crystalLib        end="\<end\>"                                 contains=TOP +  SynFold 'enum'       syn region crystalBlock       start="\<enum\>"            matchgroup=crystalEnum       end="\<end\>"                                 contains=TOP +  SynFold 'annotation' syn region crystalBlock       start="\<annotation\>"      matchgroup=crystalAnnotation end="\<end\>"                                 contains=TOP    " modifiers    syn match crystalConditionalModifier "\<\%(if\|unless\|ifdef\)\>" display @@ -326,14 +330,15 @@ if !exists('b:crystal_no_expensive') && !exists('g:crystal_no_expensive')    exec 'syn sync minlines=' . g:crystal_minlines  else    " Non-expensive mode -  syn match crystalControl "\<def\>[?!]\@!"    nextgroup=crystalMethodDeclaration skipwhite skipnl -  syn match crystalControl "\<fun\>[?!]\@!"    nextgroup=crystalFunctionDeclaration skipwhite skipnl -  syn match crystalControl "\<class\>[?!]\@!"  nextgroup=crystalClassDeclaration  skipwhite skipnl -  syn match crystalControl "\<module\>[?!]\@!" nextgroup=crystalModuleDeclaration skipwhite skipnl -  syn match crystalControl "\<struct\>[?!]\@!" nextgroup=crystalStructDeclaration skipwhite skipnl -  syn match crystalControl "\<lib\>[?!]\@!"    nextgroup=crystalLibDeclaration skipwhite skipnl -  syn match crystalControl "\<macro\>[?!]\@!"  nextgroup=crystalMacroDeclaration skipwhite skipnl -  syn match crystalControl "\<enum\>[?!]\@!"   nextgroup=crystalEnumDeclaration skipwhite skipnl +  syn match crystalControl "\<def\>[?!]\@!"        nextgroup=crystalMethodDeclaration skipwhite skipnl +  syn match crystalControl "\<fun\>[?!]\@!"        nextgroup=crystalFunctionDeclaration skipwhite skipnl +  syn match crystalControl "\<class\>[?!]\@!"      nextgroup=crystalClassDeclaration  skipwhite skipnl +  syn match crystalControl "\<module\>[?!]\@!"     nextgroup=crystalModuleDeclaration skipwhite skipnl +  syn match crystalControl "\<struct\>[?!]\@!"     nextgroup=crystalStructDeclaration skipwhite skipnl +  syn match crystalControl "\<lib\>[?!]\@!"        nextgroup=crystalLibDeclaration skipwhite skipnl +  syn match crystalControl "\<macro\>[?!]\@!"      nextgroup=crystalMacroDeclaration skipwhite skipnl +  syn match crystalControl "\<enum\>[?!]\@!"       nextgroup=crystalEnumDeclaration skipwhite skipnl +  syn match crystalControl "\<annotation\>[?!]\@!" nextgroup=crystalAnnotationDeclaration skipwhite skipnl    syn match crystalControl "\<\%(case\|begin\|do\|if\|ifdef\|unless\|while\|until\|else\|elsif\|ensure\|then\|when\|end\)\>[?!]\@!"    syn match crystalKeyword "\<\%(alias\|undef\)\>[?!]\@!"  endif @@ -358,8 +363,8 @@ endif  " Macro  " Note: This definition must be put after crystalNestedCurlyBraces to give higher priority -syn region crystalMacroRegion matchgroup=crystalMacroDelim start="\\\={%" end="%}" oneline display contains=@crystalMacroGroup containedin=ALL -syn region crystalMacroRegion matchgroup=crystalMacroDelim start="\\\={{" end="}}" oneline display contains=@crystalMacroGroup containedin=ALL +syn region crystalMacroRegion matchgroup=crystalMacroDelim start="\\\={%" end="%}" display oneline contains=@crystalMacroGroup containedin=ALL +syn region crystalMacroRegion matchgroup=crystalMacroDelim start="\\\={{" end="}}" display contains=TOP containedin=ALL  " Cluster for groups that can appear inside macro expressions  syn cluster crystalMacroGroup contains=@crystalTop @@ -375,8 +380,7 @@ syn cluster crystalMacroGroup remove=@crystalExpensive  " Some keywords will have to be redefined for them to be highlighted  " properly  syn keyword crystalMacroKeyword contained -      \ if else elsif end for in begin do case when while until loop -      \ rescue ensure +      \ if unless else elsif end for in do while until loop begin  syn cluster crystalMacroGroup add=crystalMacroKeyword @@ -414,6 +418,7 @@ hi def link crystalModule              crystalDefine  hi def link crystalStruct              crystalDefine  hi def link crystalLib                 crystalDefine  hi def link crystalEnum                crystalDefine +hi def link crystalAnnotation          crystalDefine  hi def link crystalMethodExceptional   crystalDefine  hi def link crystalDefine              Define  hi def link crystalFunction            Function @@ -442,6 +447,7 @@ hi def link crystalModuleName           crystalConstant  hi def link crystalStructName           crystalConstant  hi def link crystalLibName              crystalConstant  hi def link crystalEnumName             crystalConstant +hi def link crystalAnnotationName       crystalConstant  hi def link crystalGlobalVariable       crystalIdentifier  hi def link crystalBlockParameter       crystalIdentifier  hi def link crystalInstanceVariable     crystalIdentifier @@ -478,7 +484,7 @@ hi def link crystalRegexp               crystalString  hi def link crystalMacro                PreProc  hi def link crystalMacroDelim           crystalMacro  hi def link crystalMacroKeyword         crystalKeyword -hi def link crystalLinkAttrDelim        crystalMacro +hi def link crystalLinkAttrDelim        crystalMacroDelim  hi def link crystalError                Error  hi def link crystalInvalidVariable      crystalError  hi def link crystalSpaceError           crystalError diff --git a/syntax/dhall.vim b/syntax/dhall.vim index dbbb43d1..a28a4bc4 100644 --- a/syntax/dhall.vim +++ b/syntax/dhall.vim @@ -24,7 +24,7 @@ syntax match dhallLabel "\v[a-z_][A-Za-z0-9\-]*"  syntax match dhallType "\v[a-zA-Z]+\.[A-Z][a-z0-9A-Z_]*"  syntax match dhallParens "(\|)\|\[\|\]\|,"  syntax match dhallRecord "{\|}\|:" -syntax keyword dhallKeyword let in forall constructors if then else merge env as +syntax keyword dhallKeyword let in forall constructors if then else merge env as with  syntax match dhallEsc +\\["\\abfnrtv$/]+  syntax match dhallSingleSpecial +'''+  syntax match dhallSingleSpecial +''${+ diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim index 3968f7dd..f8d7f4e6 100644 --- a/syntax/plantuml.vim +++ b/syntax/plantuml.vim @@ -91,7 +91,7 @@ syntax region plantumlText oneline start=/\[/ms=s+1 end=/\]/me=s-1 contained  syntax match plantumlArrowDirectedLine /\([-.]\)\%(l\%[eft]\|r\%[ight]\|up\?\|d\%[own]\)\1/ contained  " Note and legend -syntax region plantumlNoteMultiLine start=/\%(^\s*[rh]\?\%(note\|legend\)\)\@<=\s\%([^:"]\+$\)\@=/ end=/^\%(\s*end\s*[rh]\?\%(note\|legend\)$\)\|endlegend\@=/ contains=plantumlSpecialString,plantumlNoteMultiLineStart,plantumlTag +syntax region plantumlNoteMultiLine start=/\%(^\s*[rh]\?\%(note\|legend\)\)\@<=\s\%([^:"]\+$\)\@=/ end=/^\%(\s*\zeend\s*[rh]\?\%(note\|legend\)$\)\|endlegend\@=/ contains=plantumlSpecialString,plantumlNoteMultiLineStart,plantumlTag  syntax match plantumlNoteMultiLineStart /\%(^\s*[rh]\?\%(note\|legend\)\)\@<=\s\%([^:]\+$\)/ contained contains=plantumlKeyword,plantumlColor,plantumlString,plantumlTag  " Class @@ -140,11 +140,11 @@ syntax match plantumlActivityLabel /\%(^\%(#\S\+\)\?\)\@<=:\_[^;|<>/\]}]\+[;|<>/  syntax match plantumlSequenceDivider /^\s*==[^=]\+==\s*$/  syntax match plantumlSequenceSpace /^\s*|||\+\s*$/  syntax match plantumlSequenceSpace /^\s*||\d\+||\+\s*$/ -syntax match plantumlSequenceDelay /^\.\{3}$/ -syntax region plantumlText oneline matchgroup=plantumlSequenceDelay start=/^\.\{3}/ end=/\.\{3}$/ +syntax match plantumlSequenceDelay /^\s*\.\{3}$/ +syntax region plantumlText oneline matchgroup=plantumlSequenceDelay start=/^\s*\.\{3}/ end=/\.\{3}$/  " Usecase diagram -syntax match plantumlUsecaseActor /:.\{-1,}:/ contains=plantumlSpecialString +syntax match plantumlUsecaseActor /^\s*:.\{-1,}:/ contains=plantumlSpecialString  " Mindmap diagram diff --git a/syntax/vifm.vim b/syntax/vifm.vim index c5eb9bf1..ffe684b3 100644 --- a/syntax/vifm.vim +++ b/syntax/vifm.vim @@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1  " vifm syntax file  " Maintainer:  xaizek <xaizek@posteo.net> -" Last Change: May 26, 2020 +" Last Change: June 22, 2020  " Inspired By: Vim syntax file by Dr. Charles E. Campbell, Jr.  if exists('b:current_syntax') @@ -17,27 +17,27 @@ set cpo-=C  " General commands  syntax keyword vifmCommand contained  		\ alink apropos bmark bmarks bmgo cds change chmod chown clone compare -		\ cope[n] co[py] cq[uit] d[elete] delbmarks delm[arks] di[splay] dirs e[dit] -		\ el[se] empty en[dif] exi[t] file fin[d] fini[sh] go[to] gr[ep] h[elp] -		\ hideui histnext his[tory] histprev jobs locate ls lstrash marks media -		\ mes[sages] mkdir m[ove] noh[lsearch] on[ly] popd pushd pu[t] pw[d] qa[ll] -		\ q[uit] redr[aw] reg[isters] regular rename restart restore rlink screen -		\ sh[ell] siblnext siblprev sor[t] sp[lit] s[ubstitute] tabc[lose] tabm[ove] -		\ tabname tabnew tabn[ext] tabo[nly] tabp[revious] touch tr trashes tree -		\ sync undol[ist] ve[rsion] vie[w] vifm vs[plit] winc[md] w[rite] wq wqa[ll] -		\ xa[ll] x[it] y[ank] +		\ cope[n] co[py] cq[uit] d[elete] delbmarks delm[arks] delsession di[splay] +		\ dirs e[dit] el[se] empty en[dif] exi[t] file fin[d] fini[sh] go[to] gr[ep] +		\ h[elp] hideui histnext his[tory] histprev jobs locate ls lstrash marks +		\ media mes[sages] mkdir m[ove] noh[lsearch] on[ly] popd pushd pu[t] pw[d] +		\ qa[ll] q[uit] redr[aw] reg[isters] regular rename restart restore rlink +		\ screen sh[ell] siblnext siblprev sor[t] sp[lit] s[ubstitute] tabc[lose] +		\ tabm[ove] tabname tabnew tabn[ext] tabo[nly] tabp[revious] touch tr +		\ trashes tree session sync undol[ist] ve[rsion] vie[w] vifm vs[plit] +		\ winc[md] w[rite] wq wqa[ll] xa[ll] x[it] y[ank]  		\ nextgroup=vifmArgs  syntax keyword vifmCommandCN contained  		\ alink apropos bmark bmarks bmgo cds change chmod chown clone compare -		\ cope[n] co[py] cq[uit] d[elete] delbmarks delm[arks] di[splay] dirs e[dit] -		\ el[se] empty en[dif] exi[t] file fin[d] fini[sh] go[to] gr[ep] h[elp] -		\ hideui histnext his[tory] histprev jobs locate ls lstrash marks media -		\ mes[sages] mkdir m[ove] noh[lsearch] on[ly] popd pushd pu[t] pw[d] qa[ll] -		\ q[uit] redr[aw] reg[isters] regular rename restart restore rlink screen -		\ sh[ell] siblnext siblprev sor[t] sp[lit] s[ubstitute] tabc[lose] tabm[ove] -		\ tabname tabnew tabn[ext] tabp[revious] touch tr trashes tree sync -		\ undol[ist] ve[rsion] vie[w] vifm vs[plit] winc[md] w[rite] wq wqa[ll] -		\ xa[ll] x[it] y[ank] +		\ cope[n] co[py] cq[uit] d[elete] delbmarks delm[arks] delsession di[splay] +		\ dirs e[dit] el[se] empty en[dif] exi[t] file fin[d] fini[sh] go[to] gr[ep] +		\ h[elp] hideui histnext his[tory] histprev jobs locate ls lstrash marks +		\ media mes[sages] mkdir m[ove] noh[lsearch] on[ly] popd pushd pu[t] pw[d] +		\ qa[ll] q[uit] redr[aw] reg[isters] regular rename restart restore rlink +		\ screen sh[ell] siblnext siblprev sor[t] sp[lit] s[ubstitute] tabc[lose] +		\ tabm[ove] tabname tabnew tabn[ext] tabo[nly] tabp[revious] touch tr +		\ trashes tree session sync undol[ist] ve[rsion] vie[w] vifm vs[plit] +		\ winc[md] w[rite] wq wqa[ll] xa[ll] x[it] y[ank]  		\ nextgroup=vifmArgsCN  " commands that might be prepended to a command without changing everything else @@ -144,12 +144,12 @@ syntax keyword vifmOption contained aproposprg autochpos caseoptions cdpath cd  		\ iec ignorecase ic iooptions incsearch is laststatus lines locateprg ls  		\ lsoptions lsview mediaprg milleroptions millerview mintimeoutlen number nu  		\ numberwidth nuw previewprg quickview relativenumber rnu rulerformat ruf -		\ runexec scrollbind scb scrolloff so sort sortgroups sortorder sortnumbers -		\ shell sh shellflagcmd shcf shortmess shm showtabline stal sizefmt slowfs -		\ smartcase scs statusline stl suggestoptions syncregs syscalls tablabel -		\ tabscope tabstop timefmt timeoutlen title tm trash trashdir ts tuioptions -		\ to undolevels ul vicmd viewcolumns vifminfo vimhelp vixcmd wildmenu wmnu -		\ wildstyle wordchars wrap wrapscan ws +		\ runexec scrollbind scb scrolloff sessionoptions ssop so sort sortgroups +		\ sortorder sortnumbers shell sh shellflagcmd shcf shortmess shm showtabline +		\ stal sizefmt slowfs smartcase scs statusline stl suggestoptions syncregs +		\ syscalls tablabel tabscope tabstop timefmt timeoutlen title tm trash +		\ trashdir ts tuioptions to undolevels ul vicmd viewcolumns vifminfo vimhelp +		\ vixcmd wildmenu wmnu wildstyle wordchars wrap wrapscan ws  " Disabled boolean options  syntax keyword vifmOption contained noautochpos nocf nochaselinks nodotfiles | 
