From 768131774bfb8375fbb03510e2892d72e27777d2 Mon Sep 17 00:00:00 2001 From: Ash Searle Date: Thu, 15 Nov 2018 11:37:46 +0000 Subject: [PATCH 01/17] Updates for Cascade Level 4 and Text Level 3 --- syntax/css.vim | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 1c603d7..f413bf5 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -193,6 +193,9 @@ syn match cssBoxProp contained "\" syn keyword cssBoxAttr contained visible hidden scroll auto syn match cssBoxAttr contained "\" +syn keyword cssCascadeProp contained all +syn keyword cssCascadeAttr contained initial unset revert + syn keyword cssColorProp contained opacity syn match cssColorProp contained "\" syn match cssColorProp contained "\" @@ -303,12 +306,13 @@ syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collaps syn keyword cssTableAttr contained fixed collapse separate show hide once always -syn keyword cssTextProp contained color direction +syn keyword cssTextProp contained color direction hyphens syn match cssTextProp "\<\(\(word\|letter\)-spacing\|text\(-\(decoration\|transform\|align\|index\|shadow\)\)\=\|vertical-align\|unicode-bidi\|line-height\)\>" syn match cssTextProp contained "\" -syn match cssTextProp contained "\" +syn match cssTextProp contained "\<\(word\|line\)-break\|\(overflow\|word\)-wrap\>" syn match cssTextProp contained "\" syn match cssTextProp contained "\" +syn match cssTextProp contained "\" syn match cssTextProp contained "\" syn match cssTextAttr contained "\" syn match cssTextAttr contained "\<\(text-\)\=\(top\|bottom\)\>" @@ -316,7 +320,7 @@ syn keyword cssTextAttr contained ltr rtl embed nowrap syn keyword cssTextAttr contained underline overline blink sub super middle syn keyword cssTextAttr contained capitalize uppercase lowercase syn keyword cssTextAttr contained justify baseline sub super -syn keyword cssTextAttr contained optimizeLegibility optimizeSpeed +syn keyword cssTextAttr contained optimizeLegibility optimizeSpeed geometricPrecision syn match cssTextAttr contained "\" syn match cssTextAttr contained "\<\(allow\|force\)-end\>" syn keyword cssTextAttr contained start end adjacent @@ -325,7 +329,7 @@ syn keyword cssTextAttr contained distribute kashida first last syn keyword cssTextAttr contained clip ellipsis unrestricted suppress syn match cssTextAttr contained "\" syn match cssTextAttr contained "\" -syn keyword cssTextAttr contained hyphenate +syn keyword cssTextAttr contained manual syn match cssTextAttr contained "\" syn match cssTransformProp contained "\" @@ -525,6 +529,7 @@ hi def link cssAnimationProp cssProp hi def link cssBackgroundProp cssProp hi def link cssBorderProp cssProp hi def link cssBoxProp cssProp +hi def link cssCascadeProp cssProp hi def link cssColorProp cssProp hi def link cssContentForPagedMediaProp cssProp hi def link cssDimensionProp cssProp @@ -585,6 +590,7 @@ hi def link cssUIAttr cssAttr hi def link cssIEUIAttr cssAttr hi def link cssAuralAttr cssAttr hi def link cssRenderAttr cssAttr +hi def link cssCascadeAttr cssAttr hi def link cssCommonAttr cssAttr hi def link cssPseudoClassId PreProc From 18fb6aacb13785e275e5260d774853d936945c15 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 19 Nov 2018 14:57:41 -0500 Subject: [PATCH 02/17] Recognize percentages as cssKeyFrameValue Closes #71 --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 1c603d7..206a87b 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -414,7 +414,7 @@ syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-pixel-ratio/ syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-\(height\|width\)/ syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/ syn keyword cssMediaAttr contained portrait landscape progressive interlace -syn match cssKeyFrameProp contained /\<\(from\|to\)\>/ nextgroup=cssDefinition +syn match cssKeyFrameProp contained /\(\d\+%\|\(\\)\)/ nextgroup=cssDefinition syn match cssPageMarginProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition syn keyword cssPageProp contained content size syn keyword cssPageProp contained orphans widows From 13306d6761b5c082b0695d643c077842f1437f1d Mon Sep 17 00:00:00 2001 From: juleswang Date: Tue, 20 Nov 2018 10:36:31 +0800 Subject: [PATCH 03/17] fix #69 --- syntax/css.vim | 9 +++------ test.css | 8 ++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index f413bf5..fae0db6 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -6,8 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " URL: https://github.com/JulesWang/css.vim " Maintainer: Jules Wang -" Last Change: 2018 Feb. 27 -" cssClassName updated by Ryuichi Hayashida Jan 2016 +" Last Change: 2018 Nov. 20 " quit when a syntax file was already loaded if !exists("main_syntax") @@ -474,7 +473,8 @@ syn match cssHacks contained /\(_\|*\)/ " Attr Enhance " Some keywords are both Prop and Attr, so we have to handle them -syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\)/ contained contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise +" cssPseudoClassId is hidden by cssAttrRegion, so we add it here. see #69 +syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\|{\)/ contained contains=cssPseudoClassId,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise " Hack for transition " 'transition' has Props after ':'. @@ -501,9 +501,6 @@ syn region cssAtRule start=/@import\>/ end=/\ze;/ contains=cssStringQ,cssStri syn region cssAtRule start=/@charset\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword syn region cssAtRule start=/@namespace\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword -" @font-face -" http://www.w3.org/TR/css3-fonts/#at-font-face-rule -syn match cssAtRule "@font-face\>" nextgroup=cssFontDescriptorBlock " @supports " https://www.w3.org/TR/css3-conditional/#at-supports syn region cssAtRule start=/@supports\>/ end=/\ze{/ skipwhite skipnl contains=cssAtRuleLogical,cssAttrRegion,css.*Prop,cssValue.*,cssVendor,cssAtKeyword,cssComment nextgroup=cssDefinition diff --git a/test.css b/test.css index 66cae3b..c5d2b24 100644 --- a/test.css +++ b/test.css @@ -261,3 +261,11 @@ and (max-device-width:1024px) grid-template-areas: auto 1fr; grid-auto-rows: auto 1fr; } + +@media all and (max-width: 250px) { + #issue69::after { + display: unset ; + position: absolute; + transition: width 2s, height 4s; + } +} From d747fee9c8c5f05cbace71bb6d74d09e37eb39ff Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 21 Nov 2018 12:59:24 -0500 Subject: [PATCH 04/17] Allow decimals in percentage-based cssKeyFrameProp --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 01b9002..1ac4b78 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -417,7 +417,7 @@ syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-pixel-ratio/ syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-\(height\|width\)/ syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/ syn keyword cssMediaAttr contained portrait landscape progressive interlace -syn match cssKeyFrameProp contained /\(\d\+%\|\(\\)\)/ nextgroup=cssDefinition +syn match cssKeyFrameProp contained /\(\d\+\(\.\d\+\)\?%\|\(\\)\)/ nextgroup=cssDefinition syn match cssPageMarginProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition syn keyword cssPageProp contained content size syn keyword cssPageProp contained orphans widows From 31b402e62e3ccfda46fb0d438517ebce6198d84b Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Tue, 23 Jul 2019 13:47:09 -0400 Subject: [PATCH 05/17] Add max-/min-/fit-content values --- syntax/css.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/css.vim b/syntax/css.vim index 1ac4b78..65f6f8c 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -132,6 +132,7 @@ syn match cssFunctionComma contained "," " Common Prop and Attr syn keyword cssCommonAttr contained auto none inherit all default normal syn keyword cssCommonAttr contained top bottom center stretch hidden visible +syn match cssCommonAttr contained "\(max-\|min-\|fit-\)content" "------------------------------------------------ " CSS Animations " http://www.w3.org/TR/css3-animations/ From 9dbc8f6805ce1578462f5caf83a09d5864703d7c Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Tue, 23 Jul 2019 14:11:48 -0400 Subject: [PATCH 06/17] Add flow and flow-root to cssPositioningAttr --- syntax/css.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/css.vim b/syntax/css.vim index 1ac4b78..869dae0 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -297,6 +297,7 @@ syn match cssPositioningAttr contained "\" syn match cssPositioningAttr contained "\" +syn match cssPositioningAttr contained "\" syn keyword cssPositioningAttr contained static relative absolute fixed subgrid syn keyword cssPrintAttr contained landscape portrait crop cross always From 35d1a48d4d9d5b04de2c5cd2646ee61ea4fcf8a9 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Tue, 23 Jul 2019 14:21:50 -0400 Subject: [PATCH 07/17] Add word boundary markers to match string --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 65f6f8c..c8d5f48 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -132,7 +132,7 @@ syn match cssFunctionComma contained "," " Common Prop and Attr syn keyword cssCommonAttr contained auto none inherit all default normal syn keyword cssCommonAttr contained top bottom center stretch hidden visible -syn match cssCommonAttr contained "\(max-\|min-\|fit-\)content" +syn match cssCommonAttr contained "\<\(max-\|min-\|fit-\)content\>" "------------------------------------------------ " CSS Animations " http://www.w3.org/TR/css3-animations/ From ac67ffc09cbf129752d159f6690431258b4c893f Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Tue, 23 Jul 2019 15:47:59 -0400 Subject: [PATCH 08/17] Skip closing parenthesis if inside string of pseudo-selector --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 1ac4b78..0bc1af5 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -440,7 +440,7 @@ syn keyword cssPseudoClassId contained link visited active hover before after le syn keyword cssPseudoClassId contained root empty target enable disabled checked invalid syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(first\|last\|only\)-\(of-type\|child\)\>" -syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" +syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ " ------------------------------------ " Vendor specific properties syn match cssPseudoClassId contained "\" From e058ffcefc332ee5a4b213e5350fe636cdce5eaf Mon Sep 17 00:00:00 2001 From: juleswang Date: Wed, 24 Jul 2019 15:06:41 +0800 Subject: [PATCH 09/17] fix @font-face and add test case for issue53 --- syntax/css.vim | 2 +- test.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 0bc1af5..1e5ee8c 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -480,7 +480,7 @@ syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\|{\)/ contained contains=cs " 'transition' has Props after ':'. syn region cssAttrRegion start=/transition\s*:/ end=/\ze\(;\|)\|}\)/ contained contains=css.*Prop,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise -syn match cssAtKeyword /@\(font-face\|media\|keyframes\|import\|charset\|namespace\|page\|supports\)/ contained +syn match cssAtKeyword /@\(font-face\|media\|keyframes\|import\|charset\|namespace\|page\|supports\)/ syn keyword cssAtRuleLogical only not and contained diff --git a/test.css b/test.css index c5d2b24..e6d10a0 100644 --- a/test.css +++ b/test.css @@ -269,3 +269,6 @@ and (max-device-width:1024px) transition: width 2s, height 4s; } } + +#issue53:not([foo=")"]) { +} From 36303ceaadcc0a7c6bc7c0013b952354d08ae002 Mon Sep 17 00:00:00 2001 From: juleswang Date: Thu, 25 Jul 2019 11:58:57 +0800 Subject: [PATCH 10/17] cssVarible, var(), calc() for #73 --- syntax/css.vim | 5 ++++- test.css | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 1e5ee8c..0c3c0d8 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -113,6 +113,7 @@ syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFac syn case ignore syn match cssImportant contained "!\s*important\>" +syn match cssVarible contained "--[a-zA-Z0-9-_]*" syn match cssColor contained "\" syn match cssColor contained "\" @@ -122,6 +123,7 @@ syn match cssColor contained "#\x\{6\}\>" contains=cssUnitDecorators syn match cssColor contained "#\x\{8\}\>" contains=cssUnitDecorators syn region cssURL contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(var\|calc\)\s*(" end=")" contains=cssVarible,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\)\=\gradient\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma @@ -429,7 +431,7 @@ syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssAttributeSelector,cssClassName,cssIdentifier,cssAtRule,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold +syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssAttributeSelector,cssClassName,cssIdentifier,cssAtRule,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssVarible,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold syn match cssBraceError "}" syn match cssAttrComma "," @@ -607,6 +609,7 @@ hi def link cssIdentifier Function hi def link cssAtRule Include hi def link cssAtKeyword PreProc hi def link cssImportant Special +hi def link cssVarible Special hi def link cssBraces Function hi def link cssBraceError Error hi def link cssError Error diff --git a/test.css b/test.css index e6d10a0..5ece379 100644 --- a/test.css +++ b/test.css @@ -272,3 +272,21 @@ and (max-device-width:1024px) #issue53:not([foo=")"]) { } + +/* issue73 */ +:root { + --font-stack: 100px; + --pad: 10px; + --small-height: 100px; + --columns: 4; + --margins: calc(24px / var(--columns)); + --primary-color: red; + --logo-text: var(--primary-color); +} + +#issue73 { + height: var(--small-height); + font-family: var(--font-stack, "Roboto", "Helvetica"); + padding: var(--pad, 10px 15px 20px); + color: var(--foo, #7F583F); +} From 48f32072a5226b966ae81df01d2da660e5416238 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 25 Jul 2019 09:03:26 -0400 Subject: [PATCH 11/17] Change 'cssVarible' to 'cssCustomProp' --- syntax/css.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 0c3c0d8..df13d87 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -113,7 +113,7 @@ syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFac syn case ignore syn match cssImportant contained "!\s*important\>" -syn match cssVarible contained "--[a-zA-Z0-9-_]*" +syn match cssCustomProp contained "--[a-zA-Z0-9-_]*" syn match cssColor contained "\" syn match cssColor contained "\" @@ -123,7 +123,7 @@ syn match cssColor contained "#\x\{6\}\>" contains=cssUnitDecorators syn match cssColor contained "#\x\{8\}\>" contains=cssUnitDecorators syn region cssURL contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(var\|calc\)\s*(" end=")" contains=cssVarible,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(var\|calc\)\s*(" end=")" contains=cssCustomProp,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\)\=\gradient\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma @@ -431,7 +431,7 @@ syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssAttributeSelector,cssClassName,cssIdentifier,cssAtRule,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssVarible,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold +syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssAttributeSelector,cssClassName,cssIdentifier,cssAtRule,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssCustomProp,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold syn match cssBraceError "}" syn match cssAttrComma "," @@ -609,7 +609,7 @@ hi def link cssIdentifier Function hi def link cssAtRule Include hi def link cssAtKeyword PreProc hi def link cssImportant Special -hi def link cssVarible Special +hi def link cssCustomProp Special hi def link cssBraces Function hi def link cssBraceError Error hi def link cssError Error From b348475d351385c5935fe0cdc05da6dbeb464703 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 25 Jul 2019 09:04:12 -0400 Subject: [PATCH 12/17] Add cssCustomProp and cssFunctionName to contains of cssAtRule --- syntax/css.vim | 2 +- test.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index df13d87..6bef752 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -488,7 +488,7 @@ syn keyword cssAtRuleLogical only not and contained " @media " Reference: http://www.w3.org/TR/css3-mediaqueries/ -syn region cssAtRule start=/@media\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssMediaProp,cssValueLength,cssAtRuleLogical,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssComment nextgroup=cssDefinition +syn region cssAtRule start=/@media\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssMediaProp,cssValueLength,cssAtRuleLogical,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssComment,cssCustomProp,cssFunctionName nextgroup=cssDefinition syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained " @page diff --git a/test.css b/test.css index 5ece379..dcba24a 100644 --- a/test.css +++ b/test.css @@ -273,6 +273,9 @@ and (max-device-width:1024px) #issue53:not([foo=")"]) { } +@media all and (min-width: var(--mobile)) { +} + /* issue73 */ :root { --font-stack: 100px; From fab4ae2d94c53319b3cc61683a2d40fb47924be2 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 26 Jul 2019 12:32:40 -0400 Subject: [PATCH 13/17] Add viewport cssUnitDecorators to cssValueLength --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 7881c20..731a37c 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -68,7 +68,7 @@ endtry " digits syn match cssValueInteger contained "[-+]\=\d\+" contains=cssUnitDecorators syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" contains=cssUnitDecorators -syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\)\>" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax)\>" contains=cssUnitDecorators syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=%" contains=cssUnitDecorators syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators From 953e13066f8bdac0848f5b94e864cff4311784b1 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Fri, 26 Jul 2019 12:38:09 -0400 Subject: [PATCH 14/17] Fix syntax error --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 731a37c..4861e32 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -68,7 +68,7 @@ endtry " digits syn match cssValueInteger contained "[-+]\=\d\+" contains=cssUnitDecorators syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" contains=cssUnitDecorators -syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax)\>" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax\)\>" contains=cssUnitDecorators syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=%" contains=cssUnitDecorators syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators From 296d5ad13f3f5de5539ed9beaa4eb721b4068936 Mon Sep 17 00:00:00 2001 From: juleswang Date: Mon, 26 Aug 2019 13:30:10 +0800 Subject: [PATCH 15/17] update: last change --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 4861e32..73bbd8d 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -6,7 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " URL: https://github.com/JulesWang/css.vim " Maintainer: Jules Wang -" Last Change: 2018 Nov. 20 +" Last Change: 2019 Jul. 29 " quit when a syntax file was already loaded if !exists("main_syntax") From 43cfa4d3afca998bd317ed484f497a4b83d9c8ce Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 27 Jul 2020 16:27:43 -0400 Subject: [PATCH 16/17] Add 'ch' unit --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 73bbd8d..c9edf7b 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -68,7 +68,7 @@ endtry " digits syn match cssValueInteger contained "[-+]\=\d\+" contains=cssUnitDecorators syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" contains=cssUnitDecorators -syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax\)\>" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax\|ch\)\>" contains=cssUnitDecorators syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=%" contains=cssUnitDecorators syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators From b9a0f1c4419d79532ba2966da8a65a0cf44aadac Mon Sep 17 00:00:00 2001 From: juleswang Date: Wed, 5 Aug 2020 09:43:14 +0800 Subject: [PATCH 17/17] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index d5a8792..3bd38cc 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +[deprecated] 301 jump to https://github.com/jsit/css.vim + + Vim CSS Syntax File ------------