Remove duplicates to Vim 8.1 default runtime

This commit also changes file names and test code for maintainability.
This commit is contained in:
Kyo Nagashima
2018-05-24 16:04:20 +09:00
parent 22049b5f2c
commit 9ee9e64622
100 changed files with 545 additions and 550 deletions

View File

@@ -8,7 +8,7 @@ CSS3 syntax (and syntax defined in some foreign specifications) support for
INSTALLATION
------------
I **strongly** recommend to install this plugin on *Vim 8.0 or higher with
I **strongly** recommend to install this plugin on *Vim 8.1 or higher with
default runtime files*.

View File

@@ -0,0 +1,5 @@
syn match cssFontProp contained "\<place-\(self\|content\|items\)\>"
syn match cssFontProp contained "\<\(row-\)\=gap\>"
syn keyword cssFontAttr contained safe unsafe legacy
syn match cssFontAttr contained "\<self-\(start\|end\)\>"
syn match cssFontAttr contained "\<space-evenly\>"

View File

View File

View File

@@ -2,4 +2,3 @@ syn match cssBoxProp contained "\<overflow-\(style\|x\|y\)\>"
syn match cssBoxProp contained "\<rotation\(-point\)\=\>"
syn keyword cssBoxAttr contained scrollbar panner marquee
syn match cssBoxAttr contained "\<ruby\(-\(base\(-group\)\=\|text\(-group\)\=\)\)\=\>"
syn match cssBoxAttr contained "\<no-\(display\|content\)\>"

View File

View File

View File

@@ -1,5 +1,3 @@
syn match cssColorProp contained "\<color-adjust\>"
syn keyword cssColor contained rebeccapurple
syn match cssColor contained "#[0-9A-Fa-f]\{8\}\>" contains=cssUnitDecorators
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(hwb\|lab\|lch\|gray\|color\|device-cmyk\|color-mod\=\)\s*(" end=")" oneline keepend
syn match cssFontDescriptor "@color-profile\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl

View File

@@ -1,4 +1,3 @@
" TODO: create cssCompositingProp and cssCompositingAttr
syn keyword cssFontProp contained isolation
syn match cssFontProp contained "\<\(mix\|background\)-blend-mode\>"
syn keyword cssFontAttr contained multiply screen overlay darken lighten color-dodge color-burn hard-light soft-light difference exclusion hue saturation color luminosity

View File

View File

@@ -1,5 +1,3 @@
" TODO: create cssCounterStyleDescriptor for `@counter-style` descriptors
syn region cssInclude start=/@counter-style\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock
syn keyword cssGeneratedContentProp contained system negative prefix suffix range pad fallback
syn match cssGeneratedContentProp contained "\<\(additive-\)\=symbols\>"
syn match cssGeneratedContentProp contained "\<speak-as\>"
@@ -12,3 +10,4 @@ syn match cssGeneratedContentAttr contained "\<disclosure-\(open\|closed\)\>"
syn match cssGeneratedContentAttr contained "\<\(japanese\|korean-hanja\|\(simp\|trad\)-chinese\)-\(in\)\=formal\>"
syn match cssGeneratedContentAttr contained "\<korean-hangul-formal\>"
syn region cssFunction contained matchgroup=cssFunctionName start="\<symbols\s*(" end=")" oneline keepend
syn match cssFontDescriptor "@counter-style\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl

View File

@@ -1,5 +0,0 @@
syn match cssFontProp contained "\<\(justify\|align\|place\)-\(self\|content\|items\)\>"
syn match cssFontProp contained "\<\(\(row\|column\)-\)\=gap\>"
syn keyword cssFontAttr contained safe unsafe legacy
syn match cssFontAttr contained "\<\(self\|flex\)-\(start\|end\)\>"
syn match cssFontAttr contained "\<space-\(between\|around\|evenly\)\>"

View File

@@ -1,3 +0,0 @@
syn match cssFontProp contained "\<animation\(-\(name\|duration\|timing-function\|iteration-count\|direction\|play-state\|delay\|fill-mode\)\)\=\>"
syn keyword cssFontAttr contained forwards backwards running paused
syn match cssFontAttr contained "\<alternate-reverse\>"

View File

@@ -1,6 +0,0 @@
syn match cssFontProp contained "\<background-\(clip\|origin\|size\)\>"
syn match cssFontProp contained "\<border-image\(-\(source\|slice\|width\|outset\|repeat\)\)\=\>"
syn match cssFontProp contained "\<border-\(\(top-right\|bottom-right\|bottom-left\|top-left\)-\)\=radius\>"
syn match cssFontProp contained "\<box-shadow\>"
syn keyword cssFontAttr contained space round local fill stretch clone slice
syn match cssFontAttr contained "\<\(padding\|border\|content\)-box\>"

View File

@@ -1,3 +0,0 @@
syn match cssFontProp contained "\<break-\(after\|before\|inside\)\>"
syn match cssFontProp contained "\<box-decoration-break\>"
syn match cssFontAttr contained "\<\(avoid-\)\=column\>"

View File

@@ -1,3 +0,0 @@
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsla\=\)\s*(" end=")" oneline keepend
syn keyword cssColorProp contained opacity
syn match cssColor contained "\<currentcolor\>"

View File

@@ -1,2 +0,0 @@
syn match cssFontProp contained "\<\(min\|max\|user\)-zoom\>"
syn region cssInclude start=/@viewport\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock

View File

@@ -1,5 +0,0 @@
syn keyword cssFontProp order
syn match cssFontProp contained "\<flex\(-\(basis\|direction\|flow\|grow\|shrink\|wrap\)\)\=\>"
syn keyword cssFontAttr contained flex row wrap
syn match cssFontAttr contained "\<inline-flex\>"
syn match cssFontAttr contained "\<\(row\|column\|wrap\)-reverse\>"

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1,9 +0,0 @@
syn match cssFontProp contained "\<grid-template\(-\(columns\|rows\|areas\)\)\=\>"
syn match cssFontProp contained "\<grid-auto-\(columns\|rows\|flow\)\>"
syn match cssFontProp contained "\<grid-\(row\|column\)\(-\(start\|end\)\)\=\>"
syn match cssFontProp contained "\<grid-area\>"
syn keyword cssFontAttr contained grid dense span
syn match cssFontAttr contained "\<inline-grid\>"
syn match cssFontAttr contained "\<auto-flow\>"
syn match cssValueNumber contained "[01]\(.\d\+\)\=fr"
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(minmax\|repeat\)\s*(" end=")" oneline keepend

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1,3 +0,0 @@
syn keyword cssFontProp contained columns
syn match cssFontProp contained "\<column-\(count\|fill\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
syn match cssFontAttr contained "\<balance\(-all\)\=\>"

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1,6 +0,0 @@
syn match cssFontProp contained "\<backface-visibility\>"
syn match cssFontProp contained "\<perspective\(-origin\)\=\>"
syn match cssFontProp contained "\<transform\(-\(origin\|style\)\)\=\>"
syn keyword cssFontAttr contained flat
syn match cssFontAttr contained "\<preserve-3d\>"
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|translate\(3d\|X\|Y\|Z\)\=\|scale\(3d\|X\|Y\|Z\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|perspective\)\s*(" end=")" oneline keepend

View File

@@ -1,5 +0,0 @@
syn match cssFontProp contained "\<transition\(-\(property\|duration\|timing-function\|delay\)\)\=\>"
syn keyword cssFontAttr contained linear
syn match cssFontAttr contained "\<ease\(-\(in\|out\|in-out\)\)\=\>"
syn match cssFontAttr contained "\<step-\(start\|end\)\>"
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(steps\|cubic-bezier\)\s*(" end=")" oneline keepend

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1 +0,0 @@
syn region cssInclude start=/@supports\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1,3 +0,0 @@
" TODO: Create cssPageAttr group
syn keyword cssFontAttr contained recto verso
syn match cssFontAttr contained "\<\(avoid-\)\=page\>"

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -0,0 +1,2 @@
syn match cssFontProp contained "\<\(min\|max\|user\)-zoom\>"
syn match cssFontDescriptor "@viewport\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl

View File

View File

View File

@@ -1,7 +1,3 @@
syn match cssFontProp contained "\<font-feature-settings\>"
syn match cssFontProp contained "\<font-kerning\>"
syn match cssFontProp contained "\<font-synthesis\>"
syn match cssFontProp contained "\<font-variant-\(alternates\|caps\|east-asian\|ligatures\|numeric\|position\)\>"
syn keyword cssFontAttr contained unicase ordinal jis78 jis83 jis90 jis04 simplified traditional
syn match cssFontAttr contained "\<\(no-\)\=\(common\|discretionary\|historical\)-ligatures\>"
syn match cssFontAttr contained "\<\(no-\)\=contextual\>"

View File

@@ -5,8 +5,7 @@ syn match cssFontProp contained "\<font-variation-settings\>"
syn match cssFontProp contained "\<font-palette\>"
syn match cssFontProp contained "\<font-presentation\>"
syn match cssFontProp contained "\<base-palette\>"
syn match cssFontProp contained "\<font-language-override\>"
syn match cssFontProp contained "\<font-variant-emoji\>"
syn keyword cssFontAttr contained emoji math fangsong infinity swap fallback optional light dark
syn match cssFontAttr contained "\<system-ui\>"
syn region cssInclude start=/@font-palette-values\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock
syn match cssFontDescriptor "@font-palette-values\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -0,0 +1,5 @@
syn match cssFontProp contained "\<grid-template\>"
syn keyword cssFontAttr contained dense span
syn match cssFontAttr contained "\<auto-flow\>"
syn match cssValueNumber contained "[01]\(.\d\+\)\=fr"
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(minmax\|repeat\)\s*(" end=")" oneline keepend

View File

@@ -1,2 +1 @@
syn keyword cssFontAttr contained subgrid
syn match cssValueNumber contained "\d\(.\d\+\)\=ar"

View File

@@ -1,6 +1,6 @@
syn match cssFontProp contained "\<object-\(fit\|position\)\>"
syn match cssFontProp contained "\<image-orientation\>"
syn keyword cssFontAttr contained contain cover snap
syn match cssFontAttr contained "\<from-image\>"
syn keyword cssFontAttr contained snap
syn match cssFontAttr contained "\<scale-down\>"
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(\(repeating-\)\=\(linear\|radial\)-gradient\)\s*(" end=")" oneline keepend
syn match cssFontAttr contained "\<from-image\>"
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(repeating-\(linear\|radial\)-gradient\)\s*(" end=")" oneline keepend

View File

View File

@@ -1,4 +1,3 @@
" TODO: create cssLineGridProp and cssLineGridAttr
syn match cssFontProp contained "\<line-\(grid\|snap\)"
syn match cssFontProp contained "\<box-snap\>"
syn keyword cssFontAttr contained create

View File

@@ -1,10 +1,7 @@
" TODO: create cssMaskingProp group and cssMaskingValue group
syn match cssFontProp contained "\<clip-\(path\|rule\)\>"
syn match cssFontProp contained "\<mask\(-\(image\|mode\|repeat\|position\|clip\|origin\|size\|composite\|type\)\)\=\>"
syn match cssFontProp contained "\<mask-border\(-\(source\|mode\|slice\|width\|outset\|repeat\)\)\=\>"
syn keyword cssFontAttr contained nonzero evenodd alpha luminance add subtract intersect exclude
syn match cssFontAttr contained "\<\(fill\|stroke\|view\)-box\>"
syn match cssFontAttr contained "\<no-clip\>"
" http://www.w3.org/TR/css-masking/#MaskElement
syn keyword cssTagName mask
syn match cssTagName "\<mask\>"

View File

@@ -0,0 +1 @@
syn match cssFontAttr contained "\<balance\(-all\)\=\>"

View File

View File

@@ -0,0 +1 @@
syn keyword cssFontAttr contained recto verso

View File

@@ -1,5 +1,5 @@
syn region cssInclude start=/@scope\>/ end=/\ze{/ skipwhite skipnl nextgroup=cssMediaBlock
syn keyword cssPseudoClassId contained host shadow content
syn match cssPseudoClassId contained "\<\(scope\|host\)-context\>"
syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":\(host\)(" end=")" oneline
syn match cssSelectorOp2 "/deep/"
syn match cssFontDescriptor "@scope\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl

View File

@@ -1,5 +1,2 @@
syn keyword cssPseudoClassId contained target enabled disabled checked indeterminate root empty
syn match cssPseudoClassId contained "\<last-\(child\|of-type\)\>"
syn match cssPseudoClassId contained "\<first-of-type\>"
syn match cssPseudoClassId contained "\<only-\(child\|of-type\)\>"
syn keyword cssPseudoClassId contained enabled indeterminate
syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":\(nth\(-last\)\=-\(child\|of-type\)\|not\)(" end=")" oneline

View File

@@ -1,5 +1,5 @@
syn match cssSelectorOp "[|]"
syn keyword cssPseudoClassId contained scope current past future default valid invalid required optional blank playing paused
syn keyword cssPseudoClassId contained scope current past future default valid required optional blank playing paused
syn match cssPseudoClassId contained "\<\(any\|local\)-link\>"
syn match cssPseudoClassId contained "\<read-\(only\|write\)\>"
syn match cssPseudoClassId contained "\<placeholder-shown\>"

View File

View File

@@ -1,20 +1,15 @@
syn keyword cssTagName animate animateMotion animateTransform circle clipPath cursor defs desc discard ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feDropShadow feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence filter foreignObject g hatch hatchpath image line linearGradient marker mesh meshgradient meshpatch meshrow metadata mpath path pattern polygon polyline radialGradient rect set solidcolor stop switch symbol text textPath tspan unknown use view
syn keyword cssFontProp contained cx cy d r rx ry x y
syn match cssFontProp contained "\<color-\(interpolation\|rendering\)\>"
syn match cssFontProp contained "\<image-rendering\>"
syn match cssFontProp contained "\<marker-\(end\|mid\|start\)\>"
syn match cssFontProp contained "\<pointer-events\>"
syn match cssFontProp contained "\<shape-rendering\>"
syn match cssFontProp contained "\<solid-\(color\|opacity\)\>"
syn match cssFontProp contained "\<stop-\(color\|opacity\)\>"
syn match cssFontProp contained "\<text-anchor\>"
syn match cssFontProp contained "\<vector-effect\>"
syn keyword cssFontAttr contained crispEdges geometricPrecision optimizeQuality painted stroke viewport visibleFill visiblePainted visibleStroke
syn keyword cssFontAttr contained crispEdges geometricPrecision optimizeQuality viewport
syn match cssFontAttr contained "\<context-\(fill\|stroke\)\>"
syn match cssFontAttr contained "\<fixed-position\>"
syn match cssFontAttr contained "\<miter\(-clip\)\=\>"
syn match cssFontAttr contained "\<non-\(scaling-stroke\|scaling-size\|rotation\)\>"
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(child\|icc-color\)\s*(" end=")" oneline keepend

View File

View File

View File

@@ -0,0 +1 @@
syn keyword cssFontAttr contained flat

View File

View File

View File

@@ -1 +0,0 @@
" N/A

View File

@@ -1 +0,0 @@
" N/A

File diff suppressed because it is too large Load Diff