diff options
Diffstat (limited to 'after/syntax')
| -rw-r--r-- | after/syntax/javascript.vim | 197 | ||||
| -rw-r--r-- | after/syntax/typescript.vim | 64 | 
2 files changed, 0 insertions, 261 deletions
| diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim index 50a22712..c36b1f21 100644 --- a/after/syntax/javascript.vim +++ b/after/syntax/javascript.vim @@ -58,200 +58,3 @@ let b:current_syntax = 'javascript.jsx'  let &cpo = s:jsx_cpo  unlet s:jsx_cpo  endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1 -" Vim syntax file -" Language:   styled-components (js/ts) -" Maintainer: Karl Fleischmann <fleischmann.karl@gmail.com> -" URL:        https://github.com/styled-components/vim-styled-components - -if exists("b:current_syntax") -  let s:current_syntax=b:current_syntax -  unlet b:current_syntax -endif - - -" fix for "-" before cssPositioningProp -"   - needs to be above CSS include to not match cssVendor definitions -syn region cssCustomPositioningPrefix contained -      \ start='-' end='\%(\s\{-}:\)\@=' -      \ contains=cssPositioningProp - -" introduce CSS cluster from built-in (or single third party syntax file) -syn include @CSS syntax/css.vim - -" try to include CSS3 definitions from multiple files -" this is only possible on vim version above 7 -if v:version >= 700 -  try -    syn include @CSS3 syntax/css/*.vim -  catch -  endtry -endif - -" TODO: include react-native keywords - -" define custom cssAttrRegion -"   - add ",", "`" and "{" to the end characters -"   - add "cssPseudoClassId" to it's containing elements -"     this will incorrectly highlight pseudo elements incorrectly used as -"     attributes but correctly highlight actual attributes -syn region cssCustomAttrRegion contained -      \ start=":" end="\ze\%(;\|)\|{\|}\|`\)" -      \ contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction, -      \          cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor, -      \          cssError,cssAttrComma,cssNoise,cssPseudoClassId, -      \          jsTemplateExpression, -      \          typescriptInterpolation,typescriptTemplateSubstitution -syn region cssCustomAttrRegion contained -      \ start="transition\s*:" end="\ze\%(;\|)\|{\|}\|`\)" -      \ contains=css.*Prop,css.*Attr,cssColor,cssImportant,cssValue.*, -      \          cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape, -      \          cssVendor,cssError,cssAttrComma,cssNoise,cssPseudoClassId, -      \          jsTemplateExpression, -      \          typescriptInterpolation,typescriptTemplateSubstitution - -" define custom css elements to not utilize cssDefinition -syn region cssCustomMediaBlock contained fold transparent matchgroup=cssBraces -      \ start="{" end="}" -      \ contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL, -      \          cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction, -      \          cssUnicodeEscape,cssVendor,cssTagName,cssClassName, -      \          cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2, -      \          cssAttributeSelector -syn region cssCustomPageWrap contained transparent matchgroup=cssBraces -      \ start="{" end="}" -      \ contains=cssPageMargin,cssPageProp,cssCustomAttrRegion,css.*Prop, -      \          cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError, -      \          cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor, -      \          cssHacks -syn match cssCustomPageMargin contained skipwhite skipnl -      \ "@\%(\%(top\|left\|right\|bottom\)-\%(left\|center\|right\|middle\|bottom\)\)\%(-corner\)\=" -syn match cssCustomKeyFrameSelector "\%(\d*%\|\<from\>\|\<to\>\)" contained -      \ skipwhite skipnl - -" define css include customly to overwrite nextgroup -syn region cssInclude start="@media\>" end="\ze{" skipwhite skipnl -      \ contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger, -      \          cssMediaMediaAttr,cssVencor,cssMediaType,cssIncludeKeyword, -      \          cssMediaComma,cssComment -      \ nextgroup=cssCustomMediaBlock - -" define all non-contained css definitions -syn cluster CSSTop -      \ contains=cssTagName,cssSelectorOp,cssAttributeSelector,cssClassName, -      \          cssBraces,cssIdentifier,cssIncludeKeyword,cssPage,cssKeyFrame, -      \          cssFontDescriptor,cssAttrComma,cssPseudoClass,cssUnicodeEscape - -" custom highlights for styled components -"   - "&" inside top level -"   - cssTagName inside of jsStrings inside of styledPrefix regions -"     TODO: override highlighting of cssTagName with more subtle one -syn match  styledAmpersand contained "&" -syn region styledTagNameString matchgroup=jsString contained -      \ start=+'+ end=+'+ skip=+\\\%(\'\|$\)+ -      \ contains=cssTagName -syn region styledTagNameString matchgroup=jsString contained -      \ start=+"+ end=+"+ skip=+\\\%(\"\|$\)+ -      \ contains=cssTagName -syn region styledTagNameString matchgroup=jsString contained -      \ start=+`+ end=+`+ skip=+\\\%(\`\|$\)+ -      \ contains=cssTagName - -" define custom API sections that trigger the styledDefinition highlighting -syn match styledPrefix "\<styled\>\.\k\+" -      \ transparent fold -      \ nextgroup=styledDefinition -      \ contains=cssTagName,javascriptTagRef -      \ containedin=jsFuncBlock,jsParen,jsObject,jsObjectValue -syn match styledPrefix "\.\<attrs\>\s*(\%(\n\|\s\|.\)\{-})" -      \ transparent fold extend -      \ nextgroup=styledDefinition -      \ contains=jsObject,jsParen -      \ containedin=jsFuncBlock,jsParen,jsObject,jsObjectValue -syn match styledPrefix "\.\<extend\>" -      \ transparent fold -      \ nextgroup=styledDefinition -      \ containedin=jsFuncBlock,jsParen,jsObject,jsObjectValue - -" define emotion css prop -" to bypass problems from top-level defined xml/js definitions, this -" plugin re-defines keywords/noise for highlighting inside of the custom -" xmlAttrib definition -syn keyword styledXmlRegionKeyword css contained -syn match   styledXmlRegionNoise "\%(=\|{\|}\)" contained -" only include styledDefinitions inside of xmlAttribs, that are wrapped -" in `css={}` regions, `keepend` is necessary to correctly break on the -" higher-level xmlAttrib region end -syn region styledXmlRegion -      \ start="\<css\>={" end="}" -      \ keepend fold -      \ containedin=xmlAttrib -      \ contains=styledXmlRegionKeyword,styledXmlRegionNoise,styledDefinition - -" define nested region for indenting -syn region styledNestedRegion contained transparent -      \ matchgroup=cssBraces -      \ start="{" end="}" - -" re-define cssError to be highlighted correctly in styledNestedRegion -syn match cssError contained "{@<>" - -" extend javascript matches to trigger styledDefinition highlighting -syn match jsTaggedTemplate extend -      \ "\<css\>\|\.\<resolve\>\|\.\<global\>\|\<keyframes\>\|\<injectGlobal\>\|\<fontFace\>\|\<createGlobalStyle\>" -      \ nextgroup=styledDefinition -syn match jsFuncCall "\<styled\>\s*(.\+)" transparent -      \ nextgroup=styledDefinition -syn match jsFuncCall "\<styled\>\s*(\%('\k\+'\|\"\k\+\"\|`\k\+`\))" -      \ contains=styledTagNameString -      \ nextgroup=styledDefinition -syn match jsFuncCall "\.\<withComponent\>\s*(\%('\k\+'\|\"\k\+\"\|`\k\+`\))" -      \ contains=styledTagNameString -syn match jsFuncCall "\<dc\>\s*(\%('\k\+'\|\"\k\+\"\|`\k\+`\))\%((\)\@=" -      \ contains=styledTagNameString -      \ nextgroup=styledDefinitionArgument - -" inject css highlighting into custom jsTemplateString region -"   - use `extend` to not end all nested jsTemplateExpression on the first -"     closing one -syn region styledDefinition contained transparent fold extend -      \ start="`" end="`" skip="\\\%(`\|$\)" -      \ contains=@CSSTop, -      \          css.*Prop,cssValue.*,cssColor,cssUrl,cssImportant,cssError, -      \          cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor, -      \          cssHacks, -      \          cssCustom.*, -      \          jsComment,jsTemplateExpression, -      \          typescriptInterpolation,typescriptTemplateSubstitution, -      \          styledAmpersand,styledNestedRegion -syn region styledDefinitionArgument contained transparent start=+(+ end=+)+ -      \ contains=styledDefinition - -""" yajs specific extensions -" define template tag keywords, that trigger styledDefinitions again to be -" contained in and also do contain the `javascriptTagRef` region -syn match javascriptTagRefStyledPrefix transparent fold -      \ "\<css\>\|\<keyframes\>\|\<injectGlobal\>\|\<fontFace\>\|\<createGlobalStyle\>" -      \ containedin=javascriptTagRef -      \ contains=javascriptTagRef -      \ nextgroup=styledDefinition -" extend the yajs clusters to include the previously and extraneously defined -" styled-related matches -syn cluster javascriptExpression -      \ add=styledPrefix,jsFuncCall,javascriptTagRefStyledPrefix -syn cluster javascriptAfterIdentifier add=styledPrefix,jsFuncCall - -" color the custom highlight elements -hi def link cssCustomKeyFrameSelector  Constant -hi def link cssCustomPositioningPrefix StorageClass -hi def link styledAmpersand            Special - -hi def link styledXmlRegionKeyword Type -hi def link styledXmlRegionNoise   Noise -hi def link styledXmlRegion        String - - -if exists("s:current_syntax") -  let b:current_syntax=s:current_syntax -endif -endif diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim index 86719158..359c1b55 100644 --- a/after/syntax/typescript.vim +++ b/after/syntax/typescript.vim @@ -46,67 +46,3 @@ let b:current_syntax = 'typescript.tsx'  let &cpo = s:jsx_cpo  unlet s:jsx_cpo  endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1 -runtime! syntax/javascript.vim - -" define custom API section, that contains typescript annotations -" this is structurally similar to `jsFuncCall`, but allows type -" annotations (delimited by brackets (e.g. "<>")) between `styled` and -" the function call parenthesis -syn match styledTypescriptPrefix -      \ "\<styled\><\%(\[\|\]\|{\|}\||\|&\|:\|;\|,\|?\|'\|\"\|\k\|\s\|\n\)\+>(\%('\k\+'\|\"\k\+\"\|\k\+\))" -      \ transparent fold extend -      \ nextgroup=styledDefinition -      \ contains=cssTagName, -      \          typescriptBraces,typescriptOpSymbols,typescriptEndColons, -      \          typescriptParens,typescriptStringS,@typescriptType, -      \          typescriptType,foldBraces, -      \          styledTagNameString -      \ containedin=foldBraces -syn match styledTypescriptPrefix -      \ "\<styled\>\%((\%('\k\+'\|\"\k\+\"\|\k\+\))\|\.\k\+\)<\%(\[\|\]\|{\|}\||\|&\|:\|;\|,\|?\|'\|\"\|\k\|\s\|\n\)\+>" -      \ transparent fold extend -      \ nextgroup=styledDefinition -      \ contains=cssTagName, -      \          typescriptBraces,typescriptOpSymbols,typescriptEndColons, -      \          typescriptParens,typescriptStringS,@typescriptType, -      \          typescriptType,foldBraces, -      \          styledTagNameString -      \ containedin=foldBraces -syn match styledTypescriptPrefix "\.\<attrs\>\s*(\%(\n\|\s\|.\)\{-})<\%(\[\|\]\|{\|}\||\|&\|:\|;\|,\|?\|'\|\"\|\k\|\s\|\n\)\+>" -      \ transparent fold extend -      \ nextgroup=styledDefinition -      \ contains=cssTagName, -      \          typescriptBraces,typescriptOpSymbols,typescriptEndColons, -      \          typescriptParens,typescriptStringS,@typescriptType, -      \          typescriptType,foldBraces, -      \          styledTagNameString -      \ containedin=foldBraces -syn match styledTypescriptPrefix "\.\<extend\><\%(\[\|\]\|{\|}\||\|&\|:\|;\|,\|?\|'\|\"\|\k\|\s\|\n\)\+>" -      \ transparent fold extend -      \ nextgroup=styledDefinition -      \ contains=cssTagName, -      \          typescriptBraces,typescriptOpSymbols,typescriptEndColons, -      \          typescriptParens,typescriptStringS,@typescriptType, -      \          typescriptType,foldBraces, -      \          styledTagNameString -      \ containedin=foldBraces - -syn match jsFuncCall "\<styled\>\s*(\%('\k\+'\|\"\k\+\"\|`\k\+`\))<\%(\[\|\]\|{\|}\||\|&\|:\|;\|,\|?\|'\|\"\|\k\|\s\|\n\)\+>" -      \ transparent fold -      \ contains=typescriptBraces,typescriptOpSymbols,typescriptEndColons, -      \          typescriptParens,typescriptStringS,@typescriptType, -      \          typescriptType,foldBraces, -      \          styledTagNameString -      \ nextgroup=styledDefinition -      \ containedin=foldBraces - -syn cluster typescriptValue add=styledPrefix,jsFuncCall,styledTypescriptPrefix - -""" yats specific extensions -" extend typescriptIdentifierName to allow styledDefinitions in their -" tagged templates -syn match typescriptIdentifierName extend -      \ "\<css\>\|\<keyframes\>\|\<injectGlobal\>\|\<fontFace\>\|\<createGlobalStyle\>" -      \ nextgroup=styledDefinition -endif | 
