From af681a78ed717d93561cedda6ef0fee09c669dd9 Mon Sep 17 00:00:00 2001 From: Kyo Nagashima Date: Mon, 9 Sep 2013 15:31:09 +0900 Subject: [PATCH 01/65] remove region definition for line comment `//` is not comment in [CSS 2.1][1] and also in [CSS3][2]. [1]: http://www.w3.org/TR/CSS21/syndata.html#comments [2]: http://www.w3.org/TR/css3-syntax/#comments --- syntax/css.vim | 1 - 1 file changed, 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index a91ed69..1d9fd53 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -460,7 +460,6 @@ syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" " Comment syn region cssComment start="/\*" end="\*/" contains=@Spell -syn region cssComment start="//" skip="\\$" end="$" keepend contains=@Spell syn match cssUnicodeEscape "\\\x\{1,6}\s\?" syn match cssSpecialCharQQ +\\"+ contained From 69d3b5353389d0361f2a8edb4fe9d48790b457af Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 10 Sep 2013 14:27:59 +0800 Subject: [PATCH 02/65] minor --- syntax/css.vim | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 1d9fd53..daca2e0 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -156,7 +156,7 @@ syn keyword cssColor contained slategray slategrey snow springgreen steelblue ta syn keyword cssColor contained thistle tomato turquoise violet wheat syn keyword cssColor contained whitesmoke yellowgreen -" FIXME: These are actually case-insentivie too, but (a) specs recommend using +" FIXME: These are actually case-insensitive too, but (a) specs recommend using " mixed-case (b) it's hard to highlight the word `Background' correctly in " all situations syn case match @@ -254,8 +254,7 @@ syn keyword cssFlexibleBoxAttr contained start end baseline syn keyword cssFlexibleBoxAttr contained reverse syn keyword cssFlexibleBoxAttr contained single mulitple syn keyword cssFlexibleBoxAttr contained horizontal -" bugfix: escape vertial-align -syn match cssFlexibleBoxAttr contained "\" +syn match cssFlexibleBoxAttr contained "\" "escape vertical-align syn match cssFlexibleBoxAttr contained "\<\(inline\|block\)-axis\>" " CSS Fonts Module Level 3 @@ -483,7 +482,7 @@ syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\| syntax match cssNoise contained /\(:\|;\|\/\)/ " Attr Enhance -" Some kewords are both Prop and Attr, so we have to handle them +" Some keywords are both Prop and Attr, so we have to handle them syn region cssAttrRegion start=/:/ end=/;/ contained keepend contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssTransitionHackProp,cssAttrComma,cssNoise " Hack for transition From a2d6ee2d9faf76756f6bf4b8506c9cd529f189fa Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Thu, 19 Sep 2013 13:26:23 +0200 Subject: [PATCH 03/65] Add folding for (multi-line) comments. --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index daca2e0..c0f8176 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -458,7 +458,7 @@ syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" " Comment -syn region cssComment start="/\*" end="\*/" contains=@Spell +syn region cssComment start="/\*" end="\*/" contains=@Spell fold syn match cssUnicodeEscape "\\\x\{1,6}\s\?" syn match cssSpecialCharQQ +\\"+ contained From 14a3b4b90ae5050ab427e63023efa2f380cdd04b Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Mon, 23 Sep 2013 07:19:56 -0700 Subject: [PATCH 04/65] bugfix for issue #35; add test file --- syntax/css.vim | 36 +++++++++++++-------------- test.css | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 test.css diff --git a/syntax/css.vim b/syntax/css.vim index c0f8176..a97aaea 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -77,23 +77,20 @@ syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)" cont syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contains=cssUnitDecorators syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contains=cssUnitDecorators - " @media -syn match cssMedia "@media\>" nextgroup=cssMediaType,cssMediaFeature,cssMediaBlock,cssMediaComma,cssMediaKeyword2 skipwhite skipnl -syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv all contained skipwhite skipnl nextgroup=cssMediaFeature,cssMediaBlock -syn match cssMediaFeature /\(and\)\=\s*(.\{-})/ contained skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor nextgroup=cssMediaFeature,cssMediaBlock,cssMediaComma -syn keyword cssMediaKeyword and contained -syn keyword cssMediaKeyword2 only not contained nextgroup=cssMediaType skipwhite skipnl - +syn match cssMedia "@media\>" nextgroup=cssMediaQuery,cssMediaBlock skipwhite skipnl +syn match cssMediaQuery /\(only\|not\)\=\s*[a-z]*\(\s\|,\)\@=\(\(\s\+and\)\=\s\+(.\{-})\)*/ contained skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType nextgroup=cssMediaBlock,cssMediaComma +syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl +syn keyword cssMediaKeyword only not and contained syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector fold -syn match cssMediaComma "," nextgroup=cssMediaType,cssMediaKeyword2 skipwhite skipnl contained +syn match cssMediaComma "," nextgroup=cssMediaQuery skipwhite skipnl contained " Reference: http://www.w3.org/TR/css3-mediaqueries/ -syn keyword cssMediaProp contained width height orientation monochrome scan grid +syn keyword cssMediaProp contained width height orientation scan grid syn match cssMediaProp contained /\(\(device\)-\)\=aspect-ratio/ 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\|color\(-index\)\=\)/ +syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/ syn keyword cssMediaAttr contained portrait landscape progressive interlace " @page @@ -103,14 +100,15 @@ syn match cssPageHeaderProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|rig syn keyword cssPageProp content size contained " @keyframe -syn match cssKeyFrame "@\(-.*-\)\=keyframes\>\(\s*\<\S*\>\)\=" nextgroup=cssKeyFrameBlock contains=cssVendor skipwhite skipnl +syn match cssKeyFrame "@\(-[a-z]*-\)\=keyframes\>\(\s*\<\S*\>\)\=" nextgroup=cssKeyFrameBlock contains=cssVendor skipwhite skipnl syn region cssKeyFrameBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector,cssDefinition syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl " @import -syn region cssInclude start=/@import\>/ end=/\ze;/ contains=cssComment,cssURL,cssUnicodeEscape,cssMediaType,cssStringQ,cssStringQQ -syn region cssInclude start=/@charset\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment -syn region cssInclude start=/@namespace\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment +syn region cssInclude start=/@import\>/ end=/\ze;/ contains=cssComment,cssURL,cssUnicodeEscape,cssMediaQuery,cssStringQ,cssStringQQ,cssIncludeKeyword +syn region cssInclude start=/@charset\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword +syn region cssInclude start=/@namespace\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword +syn keyword cssIncludeKeyword import charset namespace contained " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule @@ -593,6 +591,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssColor Constant HiLink cssIdentifier Function HiLink cssInclude Include + HiLink cssIncludeKeyword atKeyword HiLink cssImportant Special HiLink cssBraces Function HiLink cssBraceError Error @@ -602,19 +601,17 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssStringQQ String HiLink cssStringQ String HiLink cssAttributeSelector String - HiLink cssMedia Special + HiLink cssMedia atKeyword HiLink cssMediaType Special HiLink cssMediaComma Normal - HiLink cssMediaFeature Normal HiLink cssMediaKeyword Statement - HiLink cssMediaKeyword2 Statement HiLink cssMediaProp cssProp HiLink cssMediaAttr cssAttr - HiLink cssPage Special + HiLink cssPage atKeyword HiLink cssPagePseudo PreProc HiLink cssPageHeaderProp PreProc HiLink cssPageProp cssProp - HiLink cssKeyFrame Special + HiLink cssKeyFrame atKeyword HiLink cssKeyFrameSelector Constant HiLink cssFontDescriptor Special HiLink cssFontDescriptorFunction Constant @@ -626,6 +623,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssAttr Constant HiLink cssUnitDecorators Number HiLink cssNoise Noise + HiLink atKeyword Comment delcommand HiLink endif diff --git a/test.css b/test.css new file mode 100644 index 0000000..7478521 --- /dev/null +++ b/test.css @@ -0,0 +1,67 @@ +/* @media tests*/ +@media screen { + * { font-family: sans-serif } +} + + +@import url(color.css) screen and (color); + +@media all and (min-width:500px) {} +@media (min-width:500px) {} + +@media (orientation: portrait) {} +@media all and (orientation: portrait) {} + +@media screen and (color), projection and (color) {} + +@media all {} +@media {} + +@import url(example.css) screen and (color), projection and (color); +@import "example.css" screen and (color), projection and (color); + +@media screen and (color), projection and (color) {} +@media aural and (device-aspect-ratio: 16/9) {} +@media speech and (min-device-width: 800px) {} + +@media all { body { background:lime } } +@media print and (min-width: 25cm) {} +@media screen and (min-width: 400px) and (max-width: 700px) {} +@media handheld and (min-width: 20em), +screen and (min-width: 20em) {} + +@media screen and (device-width: 800px) {} +@media all and (orientation:portrait) {} +@media all and (orientation:landscape) {} + +@media screen and (device-aspect-ratio: 16/9) {} + +@media all and (color) {} +@media all and (min-color: 1) {} +@media all and (color-index) {} +@media all and (min-color-index: 1) {} +@media all and (monochrome) {} +@media all and (min-monochrome: 1) {} +@media print and (min-resolution: 300dpi) {} +@media print and (min-resolution: 118dpcm) {} +@media tv and (scan: progressive) {} +@media handheld and (grid) and (max-width: 15em) {} +@media handheld and (grid) and (max-device-height: 7em) {} + +/* issue #35 */ +@media embossed, print, aural { + .noprint { + display: none; + } +} + +/* Malformed */ +@media example { body { background:red } } +@media screen and (max-weight: 3kg) and (color), (color) +@media (min-orientation:portrait) {} +@media (color:20example) {} +@media (example, all,), speech { /* only applicable to speech devices */ } +@media &test, screen { /* only applicable to screen devices */ } +@media all and(color) {} +@media test;,all { body { background:lime } } +/* End of Malformed */ From f2b2f037d9918a2e3582a6bea173cf7bee7a6cd3 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 24 Sep 2013 05:35:04 -0700 Subject: [PATCH 05/65] minor --- .test.css.swp | Bin 0 -> 12288 bytes syntax/css.vim | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .test.css.swp diff --git a/.test.css.swp b/.test.css.swp new file mode 100644 index 0000000000000000000000000000000000000000..807a7d88281348d000c75465b7815259e73be32d GIT binary patch literal 12288 zcmeI2&u<$=6vrnV2*27Q;M7ZpR02ELu@g5<>PQekP;p3+kSJWoyJLHr-I>+yI!zRX z6GsFG%8@^T18_l50S6=`IC9~HI2M68l{0*2cXquSIgYBHsNPB++3~)4GxM1@vr_Cq z_xc+SFUZpwXpaw`|1(KcGYN{+Rsn9CWDDiC#MAA_Ip{vj+Z1Wdn)Xt zGD%nP$LS3zf((#>`!g^}hwaTXthct>y}0x&fBLDn?=K& z;D2WzjTYFy81+NoRj}Z|3teP@43GgbKnBPF86X2>fDDiUGC&5%zyo4H_>5gxWb7q; z-*3PFxBmn9`y6Axfp5WW@D2DHd;~rOH^4Qp16}|NfPtUSGWHX=4ZZ-Mg8(dpCb)Zs zu^+%E;1&qL>tGT5{sd#+gYUpCunS%W+u$5H3+_J7*e~Eq@Bs+HRd62s^%!G6f{($w z;2m%kJP)1$|2)drpWqL02mA^?11WeD^uQfB_!PVkt^@1jML-uBAOmE843GgbP&3e3 z=C5g=n<3v3!O+B^^!aj!ZR1r5Zhzso)e=F#5Bb3O2lhpHyQA1lwBHX@DESdTDxz(i z(0;=+fr*>^u)Oh{&C}wE7fY%6^g86|-ss?fizo_|CkBD!sVM?|xu-mtU_8@48ggHR zQ6O6!y|tQ18cFGmF|ZR-<+o?1%EsAW>$;TH5jR4m+a^|0ry^BG_ahUhu~2C>$jt{+ z=8aJ7w{J@Od&@rW?T(sO1a~G{#hXHu>u{#j7z<#XVmh@IVMnYGH+@%p;;SSI#6h2H zqvci^xS~xIE1mMgvgdGMl0^C~p51`ONi49swmX$16Ui_3)@=b44aS(qSO$JRpHZxQ zH#Ixq+-iI5=Di`qs-C$`Zz?|>_xb92y-m88ca(TS_c2B@ie-|hJy}hh&nefAWkQ4r zCfO?S)zwWu@@m7F6W!}}{YX_)yAsBFB5`Q6@y4+UB?dY>s*IR@8%eSvYb))`{gbj( zLguHLn;>giEL*iS-6{#}6fbSZww{sba_35|MLF|o)d!G_rHE?!XGWg3KinYPvTt^~ z(SF{2b);6hi@>g|tzx~Hjt918&ASqGDeo^Y8M{;S>f0!X;m*5bwNi{_yhd$!ZfkP`%ZwwddIH(Am~E@jt`c8z$B+H#_EK@y zX1&f&vQ=i7#6fWm+a%3a#~J{~fkc7XXq=U%6kx0+d%d{$XDsuf<3D29-2|9th= zkJm`q(X_s%F*QY*&XWXf;W2Cv@@16L(CD;16rl=mgeO8L?L@|EIDP6lCD}3UEZIkD Hf`j@$U#!mB literal 0 HcmV?d00001 diff --git a/syntax/css.vim b/syntax/css.vim index a97aaea..bb7be9c 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -6,7 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " Maintainer: Jules Wang " URL: https://github.com/JulesWang/css.vim -" Last Change: 2013 Aug 28 +" Last Change: 2013 Sep.24 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -108,7 +108,7 @@ syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl syn region cssInclude start=/@import\>/ end=/\ze;/ contains=cssComment,cssURL,cssUnicodeEscape,cssMediaQuery,cssStringQ,cssStringQQ,cssIncludeKeyword syn region cssInclude start=/@charset\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword syn region cssInclude start=/@namespace\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword -syn keyword cssIncludeKeyword import charset namespace contained +syn match cssIncludeKeyword /\(@import\|@charset\|@namespace\)/ contained " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule From 999ddfdc3ba9a8d806c10a037f2f886cb07f604c Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 24 Sep 2013 06:03:31 -0700 Subject: [PATCH 06/65] remove the offending line. #16 --- syntax/css.vim | 3 --- 1 file changed, 3 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index bb7be9c..c90205d 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -21,9 +21,6 @@ elseif exists("b:current_syntax") && b:current_syntax == "css" finish endif -" Required for cssHacks -setlocal iskeyword-=_ - let s:cpo_save = &cpo set cpo&vim From b15a0f74e6efa9ec8520e05180041dbb17a36c9e Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 24 Sep 2013 06:09:29 -0700 Subject: [PATCH 07/65] rm .swp --- .test.css.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .test.css.swp diff --git a/.test.css.swp b/.test.css.swp deleted file mode 100644 index 807a7d88281348d000c75465b7815259e73be32d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&u<$=6vrnV2*27Q;M7ZpR02ELu@g5<>PQekP;p3+kSJWoyJLHr-I>+yI!zRX z6GsFG%8@^T18_l50S6=`IC9~HI2M68l{0*2cXquSIgYBHsNPB++3~)4GxM1@vr_Cq z_xc+SFUZpwXpaw`|1(KcGYN{+Rsn9CWDDiC#MAA_Ip{vj+Z1Wdn)Xt zGD%nP$LS3zf((#>`!g^}hwaTXthct>y}0x&fBLDn?=K& z;D2WzjTYFy81+NoRj}Z|3teP@43GgbKnBPF86X2>fDDiUGC&5%zyo4H_>5gxWb7q; z-*3PFxBmn9`y6Axfp5WW@D2DHd;~rOH^4Qp16}|NfPtUSGWHX=4ZZ-Mg8(dpCb)Zs zu^+%E;1&qL>tGT5{sd#+gYUpCunS%W+u$5H3+_J7*e~Eq@Bs+HRd62s^%!G6f{($w z;2m%kJP)1$|2)drpWqL02mA^?11WeD^uQfB_!PVkt^@1jML-uBAOmE843GgbP&3e3 z=C5g=n<3v3!O+B^^!aj!ZR1r5Zhzso)e=F#5Bb3O2lhpHyQA1lwBHX@DESdTDxz(i z(0;=+fr*>^u)Oh{&C}wE7fY%6^g86|-ss?fizo_|CkBD!sVM?|xu-mtU_8@48ggHR zQ6O6!y|tQ18cFGmF|ZR-<+o?1%EsAW>$;TH5jR4m+a^|0ry^BG_ahUhu~2C>$jt{+ z=8aJ7w{J@Od&@rW?T(sO1a~G{#hXHu>u{#j7z<#XVmh@IVMnYGH+@%p;;SSI#6h2H zqvci^xS~xIE1mMgvgdGMl0^C~p51`ONi49swmX$16Ui_3)@=b44aS(qSO$JRpHZxQ zH#Ixq+-iI5=Di`qs-C$`Zz?|>_xb92y-m88ca(TS_c2B@ie-|hJy}hh&nefAWkQ4r zCfO?S)zwWu@@m7F6W!}}{YX_)yAsBFB5`Q6@y4+UB?dY>s*IR@8%eSvYb))`{gbj( zLguHLn;>giEL*iS-6{#}6fbSZww{sba_35|MLF|o)d!G_rHE?!XGWg3KinYPvTt^~ z(SF{2b);6hi@>g|tzx~Hjt918&ASqGDeo^Y8M{;S>f0!X;m*5bwNi{_yhd$!ZfkP`%ZwwddIH(Am~E@jt`c8z$B+H#_EK@y zX1&f&vQ=i7#6fWm+a%3a#~J{~fkc7XXq=U%6kx0+d%d{$XDsuf<3D29-2|9th= zkJm`q(X_s%F*QY*&XWXf;W2Cv@@16L(CD;16rl=mgeO8L?L@|EIDP6lCD}3UEZIkD Hf`j@$U#!mB From 112944be744e9492da4336528abeea80cdf04a22 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Fri, 27 Sep 2013 08:09:57 -0700 Subject: [PATCH 08/65] a simpler approach to handle @media #35 --- syntax/css.vim | 28 ++++++++++---------- test.css | 72 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 17 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index c90205d..c9c396d 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -74,13 +74,14 @@ syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)" cont syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contains=cssUnitDecorators syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contains=cssUnitDecorators + +syn match cssIncludeKeyword /\(@media\|@keyframes\|@import\|@charset\|@namespace\)/ contained " @media -syn match cssMedia "@media\>" nextgroup=cssMediaQuery,cssMediaBlock skipwhite skipnl -syn match cssMediaQuery /\(only\|not\)\=\s*[a-z]*\(\s\|,\)\@=\(\(\s\+and\)\=\s\+(.\{-})\)*/ contained skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType nextgroup=cssMediaBlock,cssMediaComma +syn region cssInclude start=/@media\>/ end=/\ze{/ transparent skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl syn keyword cssMediaKeyword only not and contained syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector fold -syn match cssMediaComma "," nextgroup=cssMediaQuery skipwhite skipnl contained +syn match cssMediaComma "," skipwhite skipnl contained " Reference: http://www.w3.org/TR/css3-mediaqueries/ syn keyword cssMediaProp contained width height orientation scan grid @@ -97,15 +98,15 @@ syn match cssPageHeaderProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|rig syn keyword cssPageProp content size contained " @keyframe -syn match cssKeyFrame "@\(-[a-z]*-\)\=keyframes\>\(\s*\<\S*\>\)\=" nextgroup=cssKeyFrameBlock contains=cssVendor skipwhite skipnl -syn region cssKeyFrameBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector,cssDefinition +syn match cssKeyFrame "@\(-[a-z]*-\)\=keyframes\>[ \t\r\n\f]\+[A-Za-z-_][A-Za-z0-9_-]*" transparent nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl +syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector,cssDefinition syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl " @import -syn region cssInclude start=/@import\>/ end=/\ze;/ contains=cssComment,cssURL,cssUnicodeEscape,cssMediaQuery,cssStringQ,cssStringQQ,cssIncludeKeyword -syn region cssInclude start=/@charset\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword -syn region cssInclude start=/@namespace\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword -syn match cssIncludeKeyword /\(@import\|@charset\|@namespace\)/ contained +syn region cssInclude start=/@import\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword,cssURL,cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType +syn region cssInclude start=/@charset\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword +syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword + " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule @@ -179,7 +180,7 @@ syn keyword cssCommonAttr contained top bottom center stretch hidden visible "------------------------------------------------ " CSS Animations " http://www.w3.org/TR/css3-animations/ -syn match cssAnimationProp contained "\" +syn match cssAnimationProp contained "\" " animation-direction attributes syn keyword cssAnimationAttr contained alternate reverse @@ -230,7 +231,7 @@ syn keyword cssBorderAttr contained clone slice syn match cssBoxProp contained "\" syn match cssBoxProp contained "\" syn match cssBoxProp contained "\" -syn match cssBoxProp contained "\" +syn match cssBoxProp contained "\" syn keyword cssBoxAttr contained visible hidden scroll auto syn match cssBoxAttr contained "\" @@ -478,11 +479,11 @@ syntax match cssNoise contained /\(:\|;\|\/\)/ " Attr Enhance " Some keywords are both Prop and Attr, so we have to handle them -syn region cssAttrRegion start=/:/ end=/;/ contained keepend contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssTransitionHackProp,cssAttrComma,cssNoise +syn region cssAttrRegion start=/:/ end=/;/ contained keepend contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise " Hack for transition " The 'transition' Prop has Props after ':'. -syn region cssAttrRegion start=/transition\s*:/ end=/;/ contained keepend contains=css.*Prop,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssTransitionHackProp,cssAttrComma,cssNoise +syn region cssAttrRegion start=/transition\s*:/ end=/;/ contained keepend contains=css.*Prop,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise if main_syntax == "css" @@ -593,7 +594,6 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssBraces Function HiLink cssBraceError Error HiLink cssError Error - HiLink cssInclude Include HiLink cssUnicodeEscape Special HiLink cssStringQQ String HiLink cssStringQ String diff --git a/test.css b/test.css index 7478521..84aba65 100644 --- a/test.css +++ b/test.css @@ -27,7 +27,7 @@ @media all { body { background:lime } } @media print and (min-width: 25cm) {} @media screen and (min-width: 400px) and (max-width: 700px) {} -@media handheld and (min-width: 20em), +@media handheld and (min-width: 20em), /*new line*/ screen and (min-width: 20em) {} @media screen and (device-width: 800px) {} @@ -55,13 +55,79 @@ screen and (min-width: 20em) {} } } +/* issue #35 */ +@media screen +and (orientation:portrait) +and (min-device-width:768px) +and (max-device-width:1024px) +,print and (max-width: 15em) { + body, div { + display:block; + } +} + +/* @keyframes tests */ +.div { + animation-name: diagonal-slide; + animation-duration: 5s; + animation-iteration-count: 10; + animation-fill-mode: 10; + animation-play-state: 12; + animation-timing-function:10; + animation-delay:10; +} + +@keyframes diagonal-slide { + from { + left: 0; + top: 0; + } + + to { + left: 100px; + top: 100px; + } +} + +@keyframes bounce { + + from { + top: 100px; + animation-timing-function: ease-out; + } + + 25% { + top: 50px; + animation-timing-function: ease-in; + } + + 50% { + top: 100px; + animation-timing-function: ease-out; + } + + 75% { + top: 75px; + animation-timing-function: ease-in; + } + + to { + top: 100px; + } + +} + +@namespace "http://www.w3.org/1999/xhtml"; +@namespace svg "http://www.w3.org/2000/svg"; +@charset "ISO-8859-1"; + /* Malformed */ -@media example { body { background:red } } +@media example { body { background: red } } @media screen and (max-weight: 3kg) and (color), (color) @media (min-orientation:portrait) {} @media (color:20example) {} @media (example, all,), speech { /* only applicable to speech devices */ } @media &test, screen { /* only applicable to screen devices */ } -@media all and(color) {} @media test;,all { body { background:lime } } +@keyframes {} /* End of Malformed */ From 0b4d1eb1f1e7cbb5e31dba7aaeb53c6f0fa5c754 Mon Sep 17 00:00:00 2001 From: Amadeus Demarzi Date: Wed, 9 Oct 2013 12:08:56 -0700 Subject: [PATCH 09/65] Changed cssInclude to NOT be transparent I would like the ability to target the cssInclude region, so I removed the transparent modifier from the region. --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index c9c396d..747eba8 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -77,7 +77,7 @@ syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contains=c syn match cssIncludeKeyword /\(@media\|@keyframes\|@import\|@charset\|@namespace\)/ contained " @media -syn region cssInclude start=/@media\>/ end=/\ze{/ transparent skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock +syn region cssInclude start=/@media\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl syn keyword cssMediaKeyword only not and contained syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector fold From a7188317739e2c5c25a3271cd9272021043905af Mon Sep 17 00:00:00 2001 From: Amadeus Demarzi Date: Mon, 21 Oct 2013 17:39:02 -0700 Subject: [PATCH 10/65] Adds specificity for dot in cssClassName The match is linked back to Function clike cssClassName to maintain backwards compatibility --- syntax/css.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 747eba8..9c01def 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -58,7 +58,8 @@ syn match cssSelectorOp2 "[~|^$*]\?=" contained syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ " .class and #id -syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+" +syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+" contains=cssClassNameDot +syn match cssClassNameDot contained '\.' try syn match cssIdentifier "#[A-Za-zĄ-’_@][A-Za-zĄ-’0-9_@-]*" @@ -616,6 +617,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssFontDescriptorAttr cssAttr HiLink cssUnicodeRange Constant HiLink cssClassName Function + HiLink cssClassNameDot Function HiLink cssProp StorageClass HiLink cssAttr Constant HiLink cssUnitDecorators Number From 0a9a420be875cf41f2b074bb493c311c4ddcfbce Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Mon, 25 Nov 2013 17:01:53 +0100 Subject: [PATCH 11/65] Recognize "\\" as css special char --- syntax/css.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 9c01def..e86a831 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -458,8 +458,8 @@ syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" syn region cssComment start="/\*" end="\*/" contains=@Spell fold syn match cssUnicodeEscape "\\\x\{1,6}\s\?" -syn match cssSpecialCharQQ +\\"+ contained -syn match cssSpecialCharQ +\\'+ contained +syn match cssSpecialCharQQ +\\\\\|\\"+ contained +syn match cssSpecialCharQ +\\\\\|\\'+ contained syn region cssStringQQ start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=cssUnicodeEscape,cssSpecialCharQQ syn region cssStringQ start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=cssUnicodeEscape,cssSpecialCharQ From b9ce65fd23719c5d7bfdb3bb3f3b9bf665dbf375 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 26 Nov 2013 09:43:06 +0800 Subject: [PATCH 12/65] add test for #39 --- test.css | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/test.css b/test.css index 84aba65..02f795e 100644 --- a/test.css +++ b/test.css @@ -48,23 +48,6 @@ screen and (min-width: 20em) {} @media handheld and (grid) and (max-width: 15em) {} @media handheld and (grid) and (max-device-height: 7em) {} -/* issue #35 */ -@media embossed, print, aural { - .noprint { - display: none; - } -} - -/* issue #35 */ -@media screen -and (orientation:portrait) -and (min-device-width:768px) -and (max-device-width:1024px) -,print and (max-width: 15em) { - body, div { - display:block; - } -} /* @keyframes tests */ .div { @@ -131,3 +114,26 @@ and (max-device-width:1024px) @media test;,all { body { background:lime } } @keyframes {} /* End of Malformed */ + +/* issue #35 */ +@media embossed, print, aural { + .noprint { + display: none; + } +} + +/* issue #35 */ +@media screen +and (orientation:portrait) +and (min-device-width:768px) +and (max-device-width:1024px) +,print and (max-width: 15em) { + body, div { + display:block; + } +} + +/* issue 39 */ +.breadcrumb:before { + content: "\\"; +} From aae1173864e388f83a22c27952ab13e27a1b565d Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 26 Nov 2013 17:43:13 +0800 Subject: [PATCH 13/65] bugfix #40 --- syntax/css.vim | 22 +++++++++++++++++----- test.css | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index e86a831..022c6a6 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -93,10 +93,11 @@ syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution syn keyword cssMediaAttr contained portrait landscape progressive interlace " @page +" http://www.w3.org/TR/css3-page/ syn match cssPage "@page\>" nextgroup=cssPagePseudo,cssDefinition skipwhite skipnl syn match cssPagePseudo /:\(left\|right\|first\|\)/ nextgroup=cssDefinition contained skipwhite skipnl syn match cssPageHeaderProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained -syn keyword cssPageProp content size contained +syn keyword cssPageProp contained content size " @keyframe syn match cssKeyFrame "@\(-[a-z]*-\)\=keyframes\>[ \t\r\n\f]\+[A-Za-z-_][A-Za-z0-9_-]*" transparent nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl @@ -291,13 +292,27 @@ syn keyword cssFontAttr contained bold bolder lighter syn match cssFontProp contained "\" syn match cssFontAttr contained "\<\(subpixel-\)\=\antialiased\>" + +" CSS Multi-column Layout Module +" http://www.w3.org/TR/css3-multicol/ +syn match cssMultiColumnProp contained "\" +syn match cssMultiColumnProp contained "\" +syn keyword cssMultiColumnProp contained columns +" http://www.w3.org/TR/2012/WD-css3-break-20120823/#page-break +syn match cssMultiColumnProp contained "\" + +syn keyword cssMultiColumnAttr contained balance medium +syn keyword cssMultiColumnAttr contained always avoid left right page column +syn match cssMultiColumnAttr contained "\" + + +" TODO find following items in w3c docs. syn keyword cssGeneratedContentProp contained quotes crop syn match cssGeneratedContentProp contained "\" syn match cssGeneratedContentProp contained "\" syn match cssGeneratedContentProp contained "\" syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>" - syn match cssGridProp contained "\" syn match cssHyerlinkProp contained "\" @@ -309,8 +324,6 @@ syn match cssListAttr contained "\<\(decimal\(-leading-zero\)\=\|cjk-ideographic syn keyword cssListAttr contained disc circle square hebrew armenian georgian syn keyword cssListAttr contained inside outside -syn match cssMultiColumnProp contained "\" - syn keyword cssPositioningProp contained bottom clear clip display float left syn keyword cssPositioningProp contained position right top visibility syn match cssPositioningProp contained "\" @@ -321,7 +334,6 @@ syn match cssPositioningAttr contained "\" syn match cssPositioningAttr contained "\" syn keyword cssPositioningAttr contained static relative absolute fixed -syn match cssPrintProp contained "\" syn keyword cssPrintProp contained orphans widows syn keyword cssPrintAttr contained landscape portrait crop cross always avoid diff --git a/test.css b/test.css index 02f795e..728b5bc 100644 --- a/test.css +++ b/test.css @@ -137,3 +137,24 @@ and (max-device-width:1024px) .breadcrumb:before { content: "\\"; } + +/* issue 40 */ +#example1 { + column-width: 1px; + column-span: inherit; + + break-before: avoid; + break-after: avoid-column; + break-inside: avoid-page; + + column-gap: inherit; + column-rule-width: inherit; + column-rule-color: inherit; + column-rule: inherit; + column-count: inherit; + columns: inherit; + + page-break-before: avoid; + page-break-after: avoid; + page-break-inside: avoid; +} From 90ead2a1fdedfe847fa01200862b89ddabc02261 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 26 Nov 2013 17:48:05 +0800 Subject: [PATCH 14/65] bugfix #41 --- syntax/css.vim | 2 +- test.css | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 022c6a6..1cbe1e3 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -218,7 +218,7 @@ syn match cssBorderProp contained "\" syn match cssBorderProp contained "\" " border-image attributes -syn keyword cssBorderAttr contained stretch repeat round space fill +syn keyword cssBorderAttr contained stretch round space fill " border-style attributes syn keyword cssBorderAttr contained dotted dashed solid double groove ridge inset outset diff --git a/test.css b/test.css index 728b5bc..6b2134e 100644 --- a/test.css +++ b/test.css @@ -158,3 +158,10 @@ and (max-device-width:1024px) page-break-after: avoid; page-break-inside: avoid; } + +/* issue 41 */ +#example2 { + background-repeat: repeat; + background-repeat: repeat-x; + background-repeat: repeat-y; +} From 4cb99ee8becca5edd5772db1e0139e3f1ca4ecea Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Wed, 27 Nov 2013 11:05:24 +0800 Subject: [PATCH 15/65] fix @page syntax --- README.md | 1 + syntax/css.vim | 31 ++++++++++++++++--------------- test.css | 41 +++++++++++++++++++++++++++++------------ 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index be48853..efe2710 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ and run `:BundleInstall` in vim. Change Log ------------ +* 2013-11-27: Fix @page syntax by reference to the w3c standard. * 2013-08-28: Add support for pseudo-class functions. * 2013-07-30: Highlight Props and Attrs with different colors. * 2013-07-22: Fix @media(issue #6),@import,@charset,@namespace,@page,@keyframe syntaxs. diff --git a/syntax/css.vim b/syntax/css.vim index 1cbe1e3..c6fc6a7 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -6,7 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " Maintainer: Jules Wang " URL: https://github.com/JulesWang/css.vim -" Last Change: 2013 Sep.24 +" Last Change: 2013 Nov.27 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -76,7 +76,7 @@ syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contains=cssUnitD syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contains=cssUnitDecorators -syn match cssIncludeKeyword /\(@media\|@keyframes\|@import\|@charset\|@namespace\)/ contained +syn match cssIncludeKeyword /@\(-[a-z]+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained " @media syn region cssInclude start=/@media\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl @@ -94,22 +94,25 @@ syn keyword cssMediaAttr contained portrait landscape progressive interlace " @page " http://www.w3.org/TR/css3-page/ -syn match cssPage "@page\>" nextgroup=cssPagePseudo,cssDefinition skipwhite skipnl -syn match cssPagePseudo /:\(left\|right\|first\|\)/ nextgroup=cssDefinition contained skipwhite skipnl -syn match cssPageHeaderProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained +syn match cssPage "@page\>[^{]*{\@=" contains=cssPagePseudo,cssIncludeKeyword nextgroup=cssPageWrap transparent skipwhite skipnl +syn match cssPagePseudo /:\(left\|right\|first\|blank\)/ contained skipwhite skipnl +syn region cssPageWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssPageMargin,cssPageProp,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks +syn match cssPageMargin /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition skipwhite skipnl syn keyword cssPageProp contained content size +" http://www.w3.org/TR/CSS2/page.html#break-inside +syn keyword cssPageProp contained orphans widows " @keyframe -syn match cssKeyFrame "@\(-[a-z]*-\)\=keyframes\>[ \t\r\n\f]\+[A-Za-z-_][A-Za-z0-9_-]*" transparent nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl -syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector,cssDefinition -syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl +" http://www.w3.org/TR/css3-animations/#keyframes +syn match cssKeyFrame "@\(-[a-z]+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent +syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector +syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl nextgroup=cssDefinition " @import syn region cssInclude start=/@import\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword,cssURL,cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType syn region cssInclude start=/@charset\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword - " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule syn match cssFontDescriptor "@font-face\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl @@ -298,13 +301,12 @@ syn match cssFontAttr contained "\<\(subpixel-\)\=\antialiased\>" syn match cssMultiColumnProp contained "\" syn match cssMultiColumnProp contained "\" syn keyword cssMultiColumnProp contained columns -" http://www.w3.org/TR/2012/WD-css3-break-20120823/#page-break -syn match cssMultiColumnProp contained "\" - syn keyword cssMultiColumnAttr contained balance medium syn keyword cssMultiColumnAttr contained always avoid left right page column syn match cssMultiColumnAttr contained "\" +" http://www.w3.org/TR/css3-break/#page-break +syn match cssMultiColumnProp contained "\" " TODO find following items in w3c docs. syn keyword cssGeneratedContentProp contained quotes crop @@ -334,7 +336,6 @@ syn match cssPositioningAttr contained "\" syn match cssPositioningAttr contained "\" syn keyword cssPositioningAttr contained static relative absolute fixed -syn keyword cssPrintProp contained orphans widows syn keyword cssPrintAttr contained landscape portrait crop cross always avoid syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>" @@ -408,7 +409,7 @@ syn keyword cssUIAttr contained both horizontal vertical syn match cssUIProp contained "\" syn keyword cssUIAttr contained clip ellipsis -" Already highlighted Props: font content +" Already highlighted Props: font content "------------------------------------------------ " Webkit/iOS specific attributes syn match cssUIAttr contained '\(preserve-3d\)' @@ -619,7 +620,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssMediaAttr cssAttr HiLink cssPage atKeyword HiLink cssPagePseudo PreProc - HiLink cssPageHeaderProp PreProc + HiLink cssPageMargin atKeyword HiLink cssPageProp cssProp HiLink cssKeyFrame atKeyword HiLink cssKeyFrameSelector Constant diff --git a/test.css b/test.css index 6b2134e..a571dc2 100644 --- a/test.css +++ b/test.css @@ -83,7 +83,6 @@ screen and (min-width: 20em) {} top: 50px; animation-timing-function: ease-in; } - 50% { top: 100px; animation-timing-function: ease-out; @@ -97,23 +96,41 @@ screen and (min-width: 20em) {} to { top: 100px; } - } + @namespace "http://www.w3.org/1999/xhtml"; @namespace svg "http://www.w3.org/2000/svg"; @charset "ISO-8859-1"; -/* Malformed */ -@media example { body { background: red } } -@media screen and (max-weight: 3kg) and (color), (color) -@media (min-orientation:portrait) {} -@media (color:20example) {} -@media (example, all,), speech { /* only applicable to speech devices */ } -@media &test, screen { /* only applicable to screen devices */ } -@media test;,all { body { background:lime } } -@keyframes {} -/* End of Malformed */ + +@page { ... } +@page :left { ... } +@page :right { ... } +@page LandscapeTable { ... } +@page CompanyLetterHead:first { ... } /* identifier and pseudo page. */ +@page:first { ... } +@page toc, index { ... } +@page :blank:first { ... } + +@page :first { + color: green; + size: 8.5in 11in; + + @top-left { + content: "foo"; + color: blue; + } + @top-right { + content: "bar"; + } +} + +@page { color: red; + @top-center { + content: "Page " counter(page); + } +} /* issue #35 */ @media embossed, print, aural { From f86f30bbcbbc044674e285b4aca61cab82a8c7e6 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Wed, 27 Nov 2013 11:09:40 +0800 Subject: [PATCH 16/65] minor --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index efe2710..93d4ad9 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ and run `:BundleInstall` in vim. Change Log ------------ -* 2013-11-27: Fix @page syntax by reference to the w3c standard. +* 2013-11-27: Fix @page syntax based on the w3c standard. * 2013-08-28: Add support for pseudo-class functions. * 2013-07-30: Highlight Props and Attrs with different colors. * 2013-07-22: Fix @media(issue #6),@import,@charset,@namespace,@page,@keyframe syntaxs. From 1cd37eb8cc80e04b3c13f73fdf12b03f744bf658 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 11 Feb 2014 04:52:21 -0800 Subject: [PATCH 17/65] bugfix for #42 --- syntax/css.vim | 10 +++++----- test.css | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index c6fc6a7..ba2a7e7 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -171,7 +171,7 @@ syn match cssColor contained "\" syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" contains=cssUnitDecorators syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" contains=cssUnitDecorators -syn region cssURL contained matchgroup=cssFunctionName start="\" syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks keepend fold +syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks fold syn match cssBraceError "}" syn match cssAttrComma "," @@ -493,11 +493,11 @@ syntax match cssNoise contained /\(:\|;\|\/\)/ " Attr Enhance " Some keywords are both Prop and Attr, so we have to handle them -syn region cssAttrRegion start=/:/ end=/;/ contained keepend contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise +syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\)/ contained contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise " Hack for transition -" The 'transition' Prop has Props after ':'. -syn region cssAttrRegion start=/transition\s*:/ end=/;/ contained keepend contains=css.*Prop,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise +" '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 if main_syntax == "css" diff --git a/test.css b/test.css index a571dc2..d0f1d6c 100644 --- a/test.css +++ b/test.css @@ -182,3 +182,17 @@ and (max-device-width:1024px) background-repeat: repeat-x; background-repeat: repeat-y; } + + +/* issue 42 */ +.issue42 { + background-image: url('{!URLFOR($Resource.images)}/background.png'); + background-image: url('{!URLFOR($Resource.images)}/background.png'), url('{!URLFOR($Resource.images)}/background.png') +} + +@font-face +{ + font-family: myFirstFont; + src: url(sansation_bold.woff); + font-weight:bold; +} From df437464b8fcf65ca62485aaf8d230c65345e792 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 11 Feb 2014 04:57:35 -0800 Subject: [PATCH 18/65] add attr 'infinite' --- syntax/css.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/syntax/css.vim b/syntax/css.vim index ba2a7e7..9230279 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -196,6 +196,9 @@ syn keyword cssAnimationAttr contained forwards backwards both " animation-play-state attributes syn keyword cssAnimationAttr contained running paused + +" animation-iteration-count attributes +syn keyword cssAnimationAttr contained infinite "------------------------------------------------ " CSS Backgrounds and Borders Module Level 3 " http://www.w3.org/TR/css3-background/ From 8c21510d8fb6aaab34fd14f74fc8203c866533bd Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 11 Feb 2014 05:03:52 -0800 Subject: [PATCH 19/65] fix a typo --- syntax/css.vim | 4 ++-- test.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 9230279..1070056 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -76,7 +76,7 @@ syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contains=cssUnitD syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contains=cssUnitDecorators -syn match cssIncludeKeyword /@\(-[a-z]+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained +syn match cssIncludeKeyword /@\(-[a-z]\+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained " @media syn region cssInclude start=/@media\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl @@ -104,7 +104,7 @@ syn keyword cssPageProp contained orphans widows " @keyframe " http://www.w3.org/TR/css3-animations/#keyframes -syn match cssKeyFrame "@\(-[a-z]+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent +syn match cssKeyFrame "@\(-[a-z]\+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl nextgroup=cssDefinition diff --git a/test.css b/test.css index d0f1d6c..5047247 100644 --- a/test.css +++ b/test.css @@ -60,7 +60,7 @@ screen and (min-width: 20em) {} animation-delay:10; } -@keyframes diagonal-slide { +@-webkit-keyframes diagonal-slide { from { left: 0; top: 0; From 2e3dc8ed7aea6d783555a3fae1036cfd5f62d0c1 Mon Sep 17 00:00:00 2001 From: Kyo Nagashima Date: Thu, 13 Feb 2014 16:15:10 +0900 Subject: [PATCH 20/65] Add `currentColor` color keyword Seealso: http://www.w3.org/TR/css3-color/#currentcolor --- syntax/css.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/css.vim b/syntax/css.vim index 1070056..f231ece 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -167,6 +167,7 @@ syn case ignore syn match cssImportant contained "!\s*important\>" syn match cssColor contained "\" +syn match cssColor contained "\" syn match cssColor contained "\" syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" contains=cssUnitDecorators syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" contains=cssUnitDecorators From 0057d52038af9c759da36a96c6717e3f5a0cf35c Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 19 Feb 2014 10:35:17 +0100 Subject: [PATCH 21/65] Add max/min support for aspect-ratios --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index f231ece..583f340 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -86,7 +86,7 @@ syn match cssMediaComma "," skipwhite skipnl contained " Reference: http://www.w3.org/TR/css3-mediaqueries/ syn keyword cssMediaProp contained width height orientation scan grid -syn match cssMediaProp contained /\(\(device\)-\)\=aspect-ratio/ +syn match cssMediaProp contained /\(\(max\|min\)-\)\(\(device\)-\)\=aspect-ratio/ 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\)\=\)/ From 8bb52cbf383e665724563c186bd2dc90ac797099 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 19 Feb 2014 14:27:39 +0100 Subject: [PATCH 22/65] Make max/min prefixes optional --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 583f340..e86343f 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -86,7 +86,7 @@ syn match cssMediaComma "," skipwhite skipnl contained " Reference: http://www.w3.org/TR/css3-mediaqueries/ syn keyword cssMediaProp contained width height orientation scan grid -syn match cssMediaProp contained /\(\(max\|min\)-\)\(\(device\)-\)\=aspect-ratio/ +syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/ 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\)\=\)/ From af6f2700ecbbe0578c024226ee2f0808e1c59564 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 19 Feb 2014 15:32:38 +0100 Subject: [PATCH 23/65] Fix typo (mulitple -> multiple) --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index e86343f..9e1651b 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -257,7 +257,7 @@ syn keyword cssDimensionProp contained width syn match cssFlexibleBoxProp contained "\" syn keyword cssFlexibleBoxAttr contained start end baseline syn keyword cssFlexibleBoxAttr contained reverse -syn keyword cssFlexibleBoxAttr contained single mulitple +syn keyword cssFlexibleBoxAttr contained single multiple syn keyword cssFlexibleBoxAttr contained horizontal syn match cssFlexibleBoxAttr contained "\" "escape vertical-align syn match cssFlexibleBoxAttr contained "\<\(inline\|block\)-axis\>" From 56c3ac5eba4c512631baf2289dea56881681cfed Mon Sep 17 00:00:00 2001 From: Amadeus Demarzi Date: Sat, 22 Mar 2014 17:30:16 -0400 Subject: [PATCH 24/65] Linked @media to PreProc instead of Comment --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 9e1651b..89f582d 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -639,7 +639,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssAttr Constant HiLink cssUnitDecorators Number HiLink cssNoise Noise - HiLink atKeyword Comment + HiLink atKeyword PreProc delcommand HiLink endif From 69fa8b585822354ba31fdc163a285f09d0198e6a Mon Sep 17 00:00:00 2001 From: Amadeus Demarzi Date: Fri, 18 Apr 2014 12:02:56 -0700 Subject: [PATCH 25/65] Fixing CSSNoise in various contexts Also fixed CSSNoise in relation to CSS comments and added a test to fix Added cssNoise to cssFontDescriptorBlock for consistency Fixed Comments By changing the order of when these matches are defined, we fix comments inside of CSS definitions that were broken by the previous commits Adding tests for CSS Comments --- syntax/css.vim | 11 +++++------ test.css | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 89f582d..1bfb39f 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -116,7 +116,7 @@ syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssSt " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule syn match cssFontDescriptor "@font-face\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl -syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssFontProp,cssFontAttr,cssCommonAttr,cssStringQ,cssStringQQ,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssUnicodeRange,cssFontDescriptorAttr +syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssFontProp,cssFontAttr,cssCommonAttr,cssStringQ,cssStringQQ,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssUnicodeRange,cssFontDescriptorAttr,cssNoise "syn match cssFontDescriptorProp contained "\<\(unicode-range\|unit-per-em\|panose-1\|cap-height\|x-height\|definition-src\)\>" "syn keyword cssFontDescriptorProp contained src stemv stemh slope ascent descent widths bbox baseline centerline mathline topline syn keyword cssFontDescriptorProp contained src @@ -452,7 +452,7 @@ syn match cssMobileTextProp contained "\" syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks fold +syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold syn match cssBraceError "}" syn match cssAttrComma "," @@ -470,6 +470,9 @@ syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" +" Misc highlight groups +syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained +syntax match cssNoise contained /\(:\|;\|\/\)/ " Comment syn region cssComment start="/\*" end="\*/" contains=@Spell fold @@ -491,10 +494,6 @@ syn match cssVendor contained "\(-\(webkit\|moz\|o\|ms\)-\)" " http://www.paulirish.com/2009/browser-specific-css-hacks/ syn match cssHacks contained /\(_\|*\)/ -" Misc highlight groups -syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained -syntax match cssNoise 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 diff --git a/test.css b/test.css index 5047247..2704137 100644 --- a/test.css +++ b/test.css @@ -178,6 +178,7 @@ and (max-device-width:1024px) /* issue 41 */ #example2 { + /* with a test comment */ background-repeat: repeat; background-repeat: repeat-x; background-repeat: repeat-y; @@ -192,6 +193,7 @@ and (max-device-width:1024px) @font-face { + /* with a test comment */ font-family: myFirstFont; src: url(sansation_bold.woff); font-weight:bold; From b90a1a7c47398063e9ffd04e0ef6a1fbff0867c8 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 19 Aug 2014 17:28:17 +0800 Subject: [PATCH 26/65] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93d4ad9..521e4b3 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,6 @@ Change Log Thanks ------------ -* ChrisYip https://github.com/amadeus/Better-CSS-Syntax-for-Vim +* ChrisYip, amadeus https://github.com/amadeus/Better-CSS-Syntax-for-Vim * hail2u https://github.com/hail2u/vim-css3-syntax * leptrue https://github.com/lepture/vim-css From 33ab453e1759323b469957e3323eea3d772386dd Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 28 Oct 2014 16:51:38 +0800 Subject: [PATCH 27/65] fix compat issue with less.vim --- syntax/css.vim | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 1bfb39f..60470ff 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -6,7 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " Maintainer: Jules Wang " URL: https://github.com/JulesWang/css.vim -" Last Change: 2013 Nov.27 +" Last Change: 2014 Oct.28 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -26,18 +26,20 @@ set cpo&vim syn case ignore -" All HTML4 tags -syn keyword cssTagName abbr acronym address applet area a b base -syn keyword cssTagName basefont bdo big blockquote body br button -syn keyword cssTagName caption center cite code col colgroup dd del -syn keyword cssTagName dfn dir div dl dt em fieldset font form frame -syn keyword cssTagName frameset h1 h2 h3 h4 h5 h6 head hr html img i -syn keyword cssTagName iframe img input ins isindex kbd label legend li -syn keyword cssTagName link map menu meta noframes noscript ol optgroup -syn keyword cssTagName option p param pre q s samp script select small -syn keyword cssTagName span strike strong style sub sup table tbody td -syn keyword cssTagName textarea tfoot th thead title tr tt ul u var +" HTML4 tags +syn keyword cssTagName abbr address area a b base +syn keyword cssTagName bdo blockquote body br button +syn keyword cssTagName cite code colgroup dd del +syn keyword cssTagName dfn div dl dt fieldset form +syn keyword cssTagName h1 h2 h3 h4 h5 h6 head hr html img i +syn keyword cssTagName iframe input ins isindex kbd label legend li +syn keyword cssTagName link map menu meta noscript ol optgroup +syn keyword cssTagName option p param q s samp script +syn keyword cssTagName strong sub sup tbody td +syn keyword cssTagName textarea tfoot th thead title tr ul u var syn keyword cssTagName object svg +syn match cssTagName /\/ +syn match cssTagName /\/ " 34 HTML5 tags syn keyword cssTagName article aside audio bdi canvas command data @@ -47,8 +49,8 @@ syn keyword cssTagName output progress rt rp ruby section syn keyword cssTagName source summary time track video wbr " Tags not supported in HTML5 -syn keyword cssDeprecated acronym applet basefont big center dir -syn keyword cssDeprecated font frame frameset noframes strike tt +" acronym applet basefont big center dir +" font frame frameset noframes strike tt syn match cssTagName "\*" From d7a9ac469b5cac23a19666e270367d1acdccad02 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Tue, 28 Oct 2014 17:27:46 +0800 Subject: [PATCH 28/65] less aggressive --- syntax/css.vim | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 60470ff..a14e8b5 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -29,17 +29,16 @@ syn case ignore " HTML4 tags syn keyword cssTagName abbr address area a b base syn keyword cssTagName bdo blockquote body br button -syn keyword cssTagName cite code colgroup dd del -syn keyword cssTagName dfn div dl dt fieldset form +syn keyword cssTagName caption cite code col colgroup dd del +syn keyword cssTagName dfn div dl dt em fieldset form syn keyword cssTagName h1 h2 h3 h4 h5 h6 head hr html img i syn keyword cssTagName iframe input ins isindex kbd label legend li syn keyword cssTagName link map menu meta noscript ol optgroup -syn keyword cssTagName option p param q s samp script -syn keyword cssTagName strong sub sup tbody td +syn keyword cssTagName option p param pre q s samp script small +syn keyword cssTagName span strong sub sup tbody td syn keyword cssTagName textarea tfoot th thead title tr ul u var syn keyword cssTagName object svg -syn match cssTagName /\/ -syn match cssTagName /\/ +syn match cssTagName /\\|\\|\/ " 34 HTML5 tags syn keyword cssTagName article aside audio bdi canvas command data From d8b2bc9310322d74a67c2e52e261ac693937bc73 Mon Sep 17 00:00:00 2001 From: Jules Wang Date: Wed, 29 Oct 2014 16:14:27 +0800 Subject: [PATCH 29/65] improve font-face --- syntax/css.vim | 67 ++++++++++++++++++++++++++++---------------------- test.css | 10 ++++++-- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index a14e8b5..608dacb 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -71,10 +71,10 @@ 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\)" contains=cssUnitDecorators -syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)" contains=cssUnitDecorators -syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contains=cssUnitDecorators -syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\)\>" contains=cssUnitDecorators +syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators +syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators +syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)\>" contains=cssUnitDecorators syn match cssIncludeKeyword /@\(-[a-z]\+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained @@ -117,15 +117,27 @@ syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssSt " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule syn match cssFontDescriptor "@font-face\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl -syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssFontProp,cssFontAttr,cssCommonAttr,cssStringQ,cssStringQQ,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssUnicodeRange,cssFontDescriptorAttr,cssNoise -"syn match cssFontDescriptorProp contained "\<\(unicode-range\|unit-per-em\|panose-1\|cap-height\|x-height\|definition-src\)\>" -"syn keyword cssFontDescriptorProp contained src stemv stemh slope ascent descent widths bbox baseline centerline mathline topline +syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssCommonAttr,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssFontDescriptorAttr,cssNoise + +syn match cssFontDescriptorProp contained "\" syn keyword cssFontDescriptorProp contained src +syn match cssFontDescriptorProp contained "\" syn match cssFontDescriptorProp contained "\" -syn keyword cssFontDescriptorAttr contained all +syn match cssFontDescriptorProp contained "\" + +" src functions syn region cssFontDescriptorFunction contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline keepend -syn match cssUnicodeRange contained "U+[0-9A-Fa-f?]\+" -syn match cssUnicodeRange contained "U+\x\+-\x\+" +" font-sytle and font-weight attributes +syn keyword cssFontDescriptorAttr contained normal italic oblique bold +" font-stretch attributes +syn match cssFontDescriptorAttr contained "\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>" +" unicode-range attributes +syn match cssFontDescriptorAttr contained "U+[0-9A-Fa-f?]\+" +syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" +" font-feature-settings attributes +syn keyword cssFontDescriptorAttr contained on off + + " The 16 basic color names syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal yellow @@ -134,23 +146,23 @@ syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon na syn keyword cssColor contained aliceblue antiquewhite aquamarine azure syn keyword cssColor contained beige bisque blanchedalmond blueviolet brown burlywood syn keyword cssColor contained cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan -syn match cssColor contained /dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)/ -syn match cssColor contained /dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)/ -syn match cssColor contained /darkslate\(blue\|gray\|grey\)/ -syn match cssColor contained /dark\(turquoise\|violet\)/ +syn match cssColor contained /\/ +syn match cssColor contained /\/ +syn match cssColor contained /\/ +syn match cssColor contained /\/ syn keyword cssColor contained deeppink deepskyblue dimgray dimgrey dodgerblue firebrick syn keyword cssColor contained floralwhite forestgreen gainsboro ghostwhite gold syn keyword cssColor contained goldenrod greenyellow grey honeydew hotpink syn keyword cssColor contained indianred indigo ivory khaki lavender lavenderblush lawngreen syn keyword cssColor contained lemonchiffon limegreen linen magenta -syn match cssColor contained /light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)/ -syn match cssColor contained /light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)/ -syn match cssColor contained /light\(slategray\|slategrey\|steelblue\)/ -syn match cssColor contained /medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)/ -syn match cssColor contained /medium\(slateblue\|springgreen\|turquoise\|violetred\)/ +syn match cssColor contained /\/ +syn match cssColor contained /\/ +syn match cssColor contained /\/ +syn match cssColor contained /\/ +syn match cssColor contained /\/ syn keyword cssColor contained midnightblue mintcream mistyrose moccasin navajowhite syn keyword cssColor contained oldlace olivedrab orange orangered orchid -syn match cssColor contained /pale\(goldenrod\|green\|turquoise\|violetred\)/ +syn match cssColor contained /\/ syn keyword cssColor contained papayawhip peachpuff peru pink plum powderblue syn keyword cssColor contained rosybrown royalblue saddlebrown salmon sandybrown syn keyword cssColor contained seagreen seashell sienna skyblue slateblue @@ -266,6 +278,7 @@ syn match cssFlexibleBoxAttr contained "\<\(inline\|block\)-axis\>" " CSS Fonts Module Level 3 " http://www.w3.org/TR/css-fonts-3/ syn match cssFontProp contained "\" + " font attributes syn keyword cssFontAttr contained icon menu caption syn match cssFontAttr contained "\" @@ -273,27 +286,21 @@ syn match cssFontAttr contained "\" syn match cssFontAttr contained "\" syn keyword cssFontAttr contained larger smaller syn match cssFontAttr contained "\<\(x\{1,2\}-\)\=\(large\|small\)\>" - " font-family attributes syn match cssFontAttr contained "\<\(sans-\)\=serif\>" -syn keyword cssFontAttr contained Antiqua Arial Black Book Charcoal Comic Courier Dingbats Gadget Geneva Georgia Grande Helvetica Impact Linotype Lucida MS Monaco Neue New Palatino Roboto Roman Symbol Tahoma Times Trebuchet Unicode Verdana Webdings Wingdings York Zapf +syn keyword cssFontAttr contained Antiqua Arial Black Book Charcoal Comic Courier Dingbats Gadget Geneva Georgia Grande Helvetica Impact Linotype Lucida MS Monaco Neue New Palatino Roboto Roman Symbol Tahoma Times Trebuchet Verdana Webdings Wingdings York Zapf syn keyword cssFontAttr contained cursive fantasy monospace - " font-feature-settings attributes syn keyword cssFontAttr contained on off - " font-stretch attributes syn match cssFontAttr contained "\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>" - " font-style attributes syn keyword cssFontAttr contained italic oblique - -" font-variant-caps attributes -syn match cssFontAttr contained "\<\(all-\)\=\(small-\|petite-\|titling-\)caps\>" -syn keyword cssFontAttr contained unicase - +" font-synthesis attributes +syn keyword cssFontAttr contained weight style " font-weight attributes syn keyword cssFontAttr contained bold bolder lighter +" TODO: font-variant-* attributes "------------------------------------------------ " Webkit specific property/attributes diff --git a/test.css b/test.css index 2704137..35dd27c 100644 --- a/test.css +++ b/test.css @@ -191,10 +191,16 @@ and (max-device-width:1024px) background-image: url('{!URLFOR($Resource.images)}/background.png'), url('{!URLFOR($Resource.images)}/background.png') } +/* @font-face test */ @font-face { /* with a test comment */ - font-family: myFirstFont; - src: url(sansation_bold.woff); + font-family: myFirstFont, serif; + src: url(ideal-sans-serif.woff) format("woff"), + url(basic-sans-serif.ttf) format("opentype"); + src: local(STIXGeneral), url(/stixfonts/STIXGeneral.otf); + unicode-range: U+000-49F, U+2000-27FF, U+2900-2BFF, U+1D400-1D7FF, U+4??; font-weight:bold; + /* negative example */ + font-size: normal; } From d56508cee3f2cc94eaa42af25d74b19f9595aa7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adelar=20da=20Silva=20Queir=C3=B3z?= Date: Wed, 29 Oct 2014 18:57:12 -0200 Subject: [PATCH 30/65] Bundle* commands are deprected --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 521e4b3..b02a3bc 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ copy `css.vim` file into your `~/.vim/syntax/` directory; add the following line to your `~/.vimrc` file; ``` -Bundle "JulesWang/css.vim" +Plugin 'JulesWang/css.vim' ``` -and run `:BundleInstall` in vim. +and run `:PluginInstall` in vim. Change Log ------------ From 9530d030ff9d9844f7e3c1923df4f13b103c06a4 Mon Sep 17 00:00:00 2001 From: Amadeus Demarzi Date: Fri, 23 Jan 2015 16:53:36 -0800 Subject: [PATCH 31/65] Adding image-rendering attributes and props --- syntax/css.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/syntax/css.vim b/syntax/css.vim index 608dacb..be6385e 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -421,6 +421,10 @@ syn keyword cssUIAttr contained both horizontal vertical syn match cssUIProp contained "\" syn keyword cssUIAttr contained clip ellipsis +syn match cssUIProp contained "\" +syn keyword cssUIAttr contained pixellated +syn match cssUIAttr contained "\" + " Already highlighted Props: font content "------------------------------------------------ " Webkit/iOS specific attributes From a7e97e00db990450ae6a6c927c3810a9fd0104e2 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 24 Mar 2015 09:40:02 +0000 Subject: [PATCH 32/65] Add more relative length units --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 608dacb..c7aaa5e 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -479,7 +479,7 @@ syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" " Misc highlight groups -syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained +syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained syntax match cssNoise contained /\(:\|;\|\/\)/ " Comment From 11dc458bd97e747d704d0604eb2495bd6d7b1034 Mon Sep 17 00:00:00 2001 From: wangjunqing Date: Fri, 17 Apr 2015 16:54:17 +0800 Subject: [PATCH 33/65] update last-change date --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index c7aaa5e..51758ca 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -6,7 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " Maintainer: Jules Wang " URL: https://github.com/JulesWang/css.vim -" Last Change: 2014 Oct.28 +" Last Change: 2015 Apr.17 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded From 5da1faef1992981ff9f3df6649836993d77b90aa Mon Sep 17 00:00:00 2001 From: wangjunqing Date: Fri, 19 Jun 2015 11:25:15 +0800 Subject: [PATCH 34/65] Fix #54 --- syntax/css.vim | 22 ++++++++++++++-------- test.css | 6 ++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 51758ca..5527eeb 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -320,6 +320,10 @@ syn match cssMultiColumnAttr contained "\" " http://www.w3.org/TR/css3-break/#page-break syn match cssMultiColumnProp contained "\" +" http://www.w3.org/TR/SVG11/interact.html +syn match cssInteractProp contained "\" +syn match cssInteractAttr contained "\<\(visible\)\=\(Painted\|Fill\|Stroke\)\=\>" + " TODO find following items in w3c docs. syn keyword cssGeneratedContentProp contained quotes crop syn match cssGeneratedContentProp contained "\" @@ -536,6 +540,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssAttrComma Special HiLink cssAnimationProp cssProp + HiLink cssAuralProp cssProp HiLink cssBackgroundProp cssProp HiLink cssBorderProp cssProp HiLink cssBoxProp cssProp @@ -547,13 +552,17 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssGeneratedContentProp cssProp HiLink cssGridProp cssProp HiLink cssHyerlinkProp cssProp + HiLink cssIEUIProp cssProp + HiLink cssInteractProp cssProp HiLink cssLineboxProp cssProp HiLink cssListProp cssProp HiLink cssMarqueeProp cssProp + HiLink cssMobileTextProp cssProp HiLink cssMultiColumnProp cssProp HiLink cssPagedMediaProp cssProp HiLink cssPositioningProp cssProp HiLink cssPrintProp cssProp + HiLink cssRenderProp cssProp HiLink cssRubyProp cssProp HiLink cssSpeechProp cssProp HiLink cssTableProp cssProp @@ -561,22 +570,22 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssTransformProp cssProp HiLink cssTransitionProp cssProp HiLink cssUIProp cssProp - HiLink cssIEUIProp cssProp - HiLink cssAuralProp cssProp - HiLink cssRenderProp cssProp - HiLink cssMobileTextProp cssProp HiLink cssAnimationAttr cssAttr + HiLink cssAuralAttr cssAttr HiLink cssBackgroundAttr cssAttr HiLink cssBorderAttr cssAttr HiLink cssBoxAttr cssAttr HiLink cssContentForPagedMediaAttr cssAttr + HiLink cssCommonAttr cssAttr HiLink cssDimensionAttr cssAttr HiLink cssFlexibleBoxAttr cssAttr HiLink cssFontAttr cssAttr HiLink cssGeneratedContentAttr cssAttr HiLink cssGridAttr cssAttr HiLink cssHyerlinkAttr cssAttr + HiLink cssIEUIAttr cssAttr + HiLink cssInteractAttr cssAttr HiLink cssLineboxAttr cssAttr HiLink cssListAttr cssAttr HiLink cssMarginAttr cssAttr @@ -587,6 +596,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssPositioningAttr cssAttr HiLink cssGradientAttr cssAttr HiLink cssPrintAttr cssAttr + HiLink cssRenderAttr cssAttr HiLink cssRubyAttr cssAttr HiLink cssSpeechAttr cssAttr HiLink cssTableAttr cssAttr @@ -594,10 +604,6 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssTransformAttr cssAttr HiLink cssTransitionAttr cssAttr HiLink cssUIAttr cssAttr - HiLink cssIEUIAttr cssAttr - HiLink cssAuralAttr cssAttr - HiLink cssRenderAttr cssAttr - HiLink cssCommonAttr cssAttr HiLink cssPseudoClassId PreProc HiLink cssPseudoClassLang Constant diff --git a/test.css b/test.css index 35dd27c..005093e 100644 --- a/test.css +++ b/test.css @@ -204,3 +204,9 @@ and (max-device-width:1024px) /* negative example */ font-size: normal; } + +/* issue 54 */ +.issue54 { + pointer-events: painted; + pointer-events: visibleFill; +} From 1adcd300006607498964d5fddc0147af83b531aa Mon Sep 17 00:00:00 2001 From: wangjunqing Date: Fri, 19 Jun 2015 12:00:05 +0800 Subject: [PATCH 35/65] Fix #56 --- syntax/css.vim | 23 +++++++++++++---------- test.css | 8 ++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 5527eeb..8212455 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -226,7 +226,6 @@ syn keyword cssBackgroundAttr contained left center right top bottom " background-repeat attributes syn match cssBackgroundAttr contained "\" syn match cssBackgroundAttr contained "\" -syn keyword cssBackgroundAttr contained space round " background-size attributes syn keyword cssBackgroundAttr contained cover contain @@ -238,7 +237,7 @@ syn match cssBorderProp contained "\" syn match cssBorderProp contained "\" " border-image attributes -syn keyword cssBorderAttr contained stretch round space fill +syn keyword cssBorderAttr contained stretch round fill " border-style attributes syn keyword cssBorderAttr contained dotted dashed solid double groove ridge inset outset @@ -266,14 +265,18 @@ syn match cssDimensionProp contained "\<\(min\|max\)-\(width\|height\)\>" syn keyword cssDimensionProp contained height syn keyword cssDimensionProp contained width -" shadow and sizing are in other property groups -syn match cssFlexibleBoxProp contained "\" -syn keyword cssFlexibleBoxAttr contained start end baseline -syn keyword cssFlexibleBoxAttr contained reverse -syn keyword cssFlexibleBoxAttr contained single multiple -syn keyword cssFlexibleBoxAttr contained horizontal -syn match cssFlexibleBoxAttr contained "\" "escape vertical-align -syn match cssFlexibleBoxAttr contained "\<\(inline\|block\)-axis\>" +" CSS Flexible Box Layout Module Level 1 +" http://www.w3.org/TR/css3-flexbox/ +" CSS Box Alignment Module Level 3 +" http://www.w3.org/TR/css-align-3/ +syn match cssFlexibleBoxProp contained "\" +syn match cssFlexibleBoxProp contained "\<\(align\|justify\)\(-\(items\|self\|content\)\)\=\>" +syn keyword cssFlexibleBoxProp contained order + +syn match cssFlexibleBoxAttr contained "\<\(row\|column\|wrap\)\(-reverse\)\=\>" +syn keyword cssFlexibleBoxAttr contained nowrap stretch baseline center +syn match cssFlexibleBoxAttr contained "\" +syn match cssFlexibleBoxAttr contained "\" " CSS Fonts Module Level 3 " http://www.w3.org/TR/css-fonts-3/ diff --git a/test.css b/test.css index 005093e..1990cc5 100644 --- a/test.css +++ b/test.css @@ -210,3 +210,11 @@ and (max-device-width:1024px) pointer-events: painted; pointer-events: visibleFill; } + +/* issue 56 */ +.issue56 { + flex-direction: row-reverse; + flex-flow: row nowrap; + align-self: flex-start; + justify-content: space-between; +} From ae41b5302d66bf8e76c4161c26fad1167c2a949b Mon Sep 17 00:00:00 2001 From: wangjunqing Date: Tue, 25 Aug 2015 15:15:36 +0800 Subject: [PATCH 36/65] for #57 --- syntax/css.vim | 4 ++-- test.css | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 8212455..802970e 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -164,8 +164,8 @@ syn keyword cssColor contained midnightblue mintcream mistyrose moccasin navajow syn keyword cssColor contained oldlace olivedrab orange orangered orchid syn match cssColor contained /\/ syn keyword cssColor contained papayawhip peachpuff peru pink plum powderblue -syn keyword cssColor contained rosybrown royalblue saddlebrown salmon sandybrown -syn keyword cssColor contained seagreen seashell sienna skyblue slateblue +syn keyword cssColor contained rosybrown royalblue rebeccapurple saddlebrown salmon +syn keyword cssColor contained sandybrown seagreen seashell sienna skyblue slateblue syn keyword cssColor contained slategray slategrey snow springgreen steelblue tan syn keyword cssColor contained thistle tomato turquoise violet wheat syn keyword cssColor contained whitesmoke yellowgreen diff --git a/test.css b/test.css index 1990cc5..b4378c9 100644 --- a/test.css +++ b/test.css @@ -205,16 +205,18 @@ and (max-device-width:1024px) font-size: normal; } -/* issue 54 */ .issue54 { pointer-events: painted; pointer-events: visibleFill; } -/* issue 56 */ .issue56 { flex-direction: row-reverse; flex-flow: row nowrap; align-self: flex-start; justify-content: space-between; } + +.issue57 { + color: rebeccapurple; +} From f501cd542fbb887111af987a7d9d7cf3c30a9e16 Mon Sep 17 00:00:00 2001 From: wangjunqing Date: Tue, 25 Aug 2015 15:18:29 +0800 Subject: [PATCH 37/65] rm changelog;update Last Change --- README.md | 11 ----------- syntax/css.vim | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index b02a3bc..d5a8792 100644 --- a/README.md +++ b/README.md @@ -18,17 +18,6 @@ Plugin 'JulesWang/css.vim' and run `:PluginInstall` in vim. -Change Log ------------- -* 2013-11-27: Fix @page syntax based on the w3c standard. -* 2013-08-28: Add support for pseudo-class functions. -* 2013-07-30: Highlight Props and Attrs with different colors. -* 2013-07-22: Fix @media(issue #6),@import,@charset,@namespace,@page,@keyframe syntaxs. -* 2013-01-13: Add support for installation using vundle. -* 2011-10-15: Add 130 more color names. -* 2011-09-13: Test and add some missing items. -* 2011-09-11: 80% css3 support. - Thanks ------------ * ChrisYip, amadeus https://github.com/amadeus/Better-CSS-Syntax-for-Vim diff --git a/syntax/css.vim b/syntax/css.vim index 802970e..144a43d 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -6,7 +6,7 @@ " Nikolai Weibull (Add CSS2 support) " Maintainer: Jules Wang " URL: https://github.com/JulesWang/css.vim -" Last Change: 2015 Apr.17 +" Last Change: 2015 Aug.25 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded From f081b52c542ef8428f7f66701a5cddf5336d591e Mon Sep 17 00:00:00 2001 From: JulesWang Date: Fri, 26 Feb 2016 13:18:48 +0800 Subject: [PATCH 38/65] fix flex highlight in display: flex; for #59 --- syntax/css.vim | 2 +- test.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index dd13eaf..e7cfa16 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -275,7 +275,7 @@ syn keyword cssFlexibleBoxProp contained order syn match cssFlexibleBoxAttr contained "\<\(row\|column\|wrap\)\(-reverse\)\=\>" syn keyword cssFlexibleBoxAttr contained nowrap stretch baseline center -syn match cssFlexibleBoxAttr contained "\" +syn match cssFlexibleBoxAttr contained "\" syn match cssFlexibleBoxAttr contained "\" " CSS Fonts Module Level 3 diff --git a/test.css b/test.css index b4378c9..626341b 100644 --- a/test.css +++ b/test.css @@ -220,3 +220,7 @@ and (max-device-width:1024px) .issue57 { color: rebeccapurple; } + +.issue59 { + display: flex; +} From 3df6c88fceb9701d5e6f704271575eb05fbbb5e8 Mon Sep 17 00:00:00 2001 From: Amadeus Demarzi Date: Sat, 27 Feb 2016 12:06:38 -0800 Subject: [PATCH 39/65] Adding viewport units --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index e7cfa16..e03711f 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -71,7 +71,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\)\>" contains=cssUnitDecorators +syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|vh\|vw\|vmin\|vmax\)\>" contains=cssUnitDecorators syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)\>" contains=cssUnitDecorators From ce54ea96809fa7c53339af8f1c4fd30ede678f18 Mon Sep 17 00:00:00 2001 From: Amadeus Demarzi Date: Wed, 9 Mar 2016 15:10:08 -0800 Subject: [PATCH 40/65] Fixes avoid/avoid-page/avoid-column value matching It appears that having avoid set as a keyword, breaks the matching of properties like avoid-page and avoid-column. The fix involves remove avoid as a keyword and instead using a regex to match the various possibilities. --- syntax/css.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index e03711f..2a3d48d 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -317,8 +317,8 @@ syn match cssMultiColumnProp contained "\" syn match cssMultiColumnProp contained "\" syn keyword cssMultiColumnProp contained columns syn keyword cssMultiColumnAttr contained balance medium -syn keyword cssMultiColumnAttr contained always avoid left right page column -syn match cssMultiColumnAttr contained "\" +syn keyword cssMultiColumnAttr contained always left right page column +syn match cssMultiColumnAttr contained "\" " http://www.w3.org/TR/css3-break/#page-break syn match cssMultiColumnProp contained "\" @@ -355,7 +355,7 @@ syn match cssPositioningAttr contained "\" syn match cssPositioningAttr contained "\" syn keyword cssPositioningAttr contained static relative absolute fixed -syn keyword cssPrintAttr contained landscape portrait crop cross always avoid +syn keyword cssPrintAttr contained landscape portrait crop cross always syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>" syn keyword cssTableAttr contained fixed collapse separate show hide once always From cf6502acb28a7a2f89fd2dbe80777ba3dc4f8e06 Mon Sep 17 00:00:00 2001 From: JulesWang Date: Mon, 14 Mar 2016 14:27:18 +0800 Subject: [PATCH 41/65] fix #61 --- syntax/css.vim | 38 ++++++++++++++------------------------ test.css | 31 ++++++++++++++++--------------- 2 files changed, 30 insertions(+), 39 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 2a3d48d..07475aa 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -68,21 +68,16 @@ catch /^.*/ syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*" 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\|vh\|vw\|vmin\|vmax\)\>" contains=cssUnitDecorators -syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators -syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators -syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)\>" contains=cssUnitDecorators - +" digits and units +syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=%\=" contains=cssUnitDecorators +syn match cssValue contained transparent "[-+]\=\d\+\(\.\d*\)\=\([a-z]\+\)\=\>" contains=cssUnitDecorators,cssValueNumber syn match cssIncludeKeyword /@\(-[a-z]\+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained " @media syn region cssInclude start=/@media\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl syn keyword cssMediaKeyword only not and contained -syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector fold +syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector fold syn match cssMediaComma "," skipwhite skipnl contained " Reference: http://www.w3.org/TR/css3-mediaqueries/ @@ -97,7 +92,7 @@ syn keyword cssMediaAttr contained portrait landscape progressive interlace " http://www.w3.org/TR/css3-page/ syn match cssPage "@page\>[^{]*{\@=" contains=cssPagePseudo,cssIncludeKeyword nextgroup=cssPageWrap transparent skipwhite skipnl syn match cssPagePseudo /:\(left\|right\|first\|blank\)/ contained skipwhite skipnl -syn region cssPageWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssPageMargin,cssPageProp,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks +syn region cssPageWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssPageMargin,cssPageProp,cssAttrRegion,css.*Prop,cssComment,cssValue,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks syn match cssPageMargin /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition skipwhite skipnl syn keyword cssPageProp contained content size " http://www.w3.org/TR/CSS2/page.html#break-inside @@ -107,7 +102,7 @@ syn keyword cssPageProp contained orphans widows " http://www.w3.org/TR/css3-animations/#keyframes syn match cssKeyFrame "@\(-[a-z]\+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector -syn match cssKeyFrameSelector /\(\d*%\|from\|to\)\=/ contained skipwhite skipnl nextgroup=cssDefinition +syn match cssKeyFrameSelector /\([-+]\=\d\+\(\.\d*\)\=%\|from\|to\)\=/ contained skipwhite skipnl nextgroup=cssDefinition " @import syn region cssInclude start=/@import\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword,cssURL,cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType @@ -117,7 +112,7 @@ syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssSt " @font-face " http://www.w3.org/TR/css3-fonts/#at-font-face-rule syn match cssFontDescriptor "@font-face\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl -syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssCommonAttr,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssFontDescriptorAttr,cssNoise +syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssCommonAttr,cssFontDescriptorProp,cssValue,cssFontDescriptorFunction,cssFontDescriptorAttr,cssNoise syn match cssFontDescriptorProp contained "\" syn keyword cssFontDescriptorProp contained src @@ -186,10 +181,10 @@ syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" contains=cssUnitDecorators syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" contains=cssUnitDecorators syn region cssURL contained matchgroup=cssFunctionName start="\" syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=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=cssAttrRegion,css.*Prop,cssComment,cssValue,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold syn match cssBraceError "}" syn match cssAttrComma "," @@ -515,11 +510,11 @@ 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 +syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\)/ contained contains=css.*Attr,cssColor,cssImportant,cssValue,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise " Hack for transition " '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 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 if main_syntax == "css" @@ -614,12 +609,7 @@ if version >= 508 || !exists("did_css_syn_inits") HiLink cssPseudoClassId PreProc HiLink cssPseudoClassLang Constant - HiLink cssValueLength Number - HiLink cssValueInteger Number HiLink cssValueNumber Number - HiLink cssValueAngle Number - HiLink cssValueTime Number - HiLink cssValueFrequency Number HiLink cssFunction Constant HiLink cssURL String HiLink cssFunctionName Function diff --git a/test.css b/test.css index 626341b..6e55e09 100644 --- a/test.css +++ b/test.css @@ -51,7 +51,7 @@ screen and (min-width: 20em) {} /* @keyframes tests */ .div { - animation-name: diagonal-slide; + animation-name: custom-name-not-highlighted; animation-duration: 5s; animation-iteration-count: 10; animation-fill-mode: 10; @@ -60,7 +60,7 @@ screen and (min-width: 20em) {} animation-delay:10; } -@-webkit-keyframes diagonal-slide { +@-webkit-keyframes custom-name-not-highlighted { from { left: 0; top: 0; @@ -88,7 +88,7 @@ screen and (min-width: 20em) {} animation-timing-function: ease-out; } - 75% { + 75.75% { top: 75px; animation-timing-function: ease-in; } @@ -150,13 +150,11 @@ and (max-device-width:1024px) } } -/* issue 39 */ -.breadcrumb:before { +#issue39:before { content: "\\"; } -/* issue 40 */ -#example1 { +#issue40 { column-width: 1px; column-span: inherit; @@ -176,8 +174,7 @@ and (max-device-width:1024px) page-break-inside: avoid; } -/* issue 41 */ -#example2 { +#issue41 { /* with a test comment */ background-repeat: repeat; background-repeat: repeat-x; @@ -185,8 +182,7 @@ and (max-device-width:1024px) } -/* issue 42 */ -.issue42 { +#issue42 { background-image: url('{!URLFOR($Resource.images)}/background.png'); background-image: url('{!URLFOR($Resource.images)}/background.png'), url('{!URLFOR($Resource.images)}/background.png') } @@ -205,22 +201,27 @@ and (max-device-width:1024px) font-size: normal; } -.issue54 { +#issue54 { pointer-events: painted; pointer-events: visibleFill; } -.issue56 { +#issue56 { flex-direction: row-reverse; flex-flow: row nowrap; align-self: flex-start; justify-content: space-between; } -.issue57 { +#issue57 { color: rebeccapurple; } -.issue59 { +#issue59 { display: flex; } + +#issue61 { + height: +10.10px; + height: -1000%; +} From ff1b0a23fe214954b5e9314ca0952d45c3ab447c Mon Sep 17 00:00:00 2001 From: JulesWang Date: Mon, 14 Mar 2016 14:44:12 +0800 Subject: [PATCH 42/65] minor --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 07475aa..516aa82 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -485,7 +485,7 @@ syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" " Misc highlight groups -syntax match cssUnitDecorators /\(#\|-\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained +syntax match cssUnitDecorators /\(#\|-\|+\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained syntax match cssNoise contained /\(:\|;\|\/\)/ " Comment From 49d7c44e73ade0829b0648d3e17e6850ae0335df Mon Sep 17 00:00:00 2001 From: JulesWang Date: Mon, 14 Mar 2016 15:08:29 +0800 Subject: [PATCH 43/65] minor --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 516aa82..11b5023 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -485,7 +485,7 @@ syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" " Misc highlight groups -syntax match cssUnitDecorators /\(#\|-\|+\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained +syntax match cssUnitDecorators /\(#\|-\|+\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained syntax match cssNoise contained /\(:\|;\|\/\)/ " Comment From de49e980f069f64575ecae0aaf1db491d6335615 Mon Sep 17 00:00:00 2001 From: juleswang Date: Fri, 9 Jun 2017 11:45:46 +0800 Subject: [PATCH 44/65] Create README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index d5a8792..8c2b421 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +# This repo is Deprecated +# Pls go to https://github.com/vim/vim/blob/master/runtime/syntax/css.vim + Vim CSS Syntax File ------------ From e12ce858952bedb119330e4af3b47354d984bf52 Mon Sep 17 00:00:00 2001 From: juleswang Date: Tue, 27 Feb 2018 15:58:51 +0800 Subject: [PATCH 45/65] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 8c2b421..d5a8792 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -# This repo is Deprecated -# Pls go to https://github.com/vim/vim/blob/master/runtime/syntax/css.vim - Vim CSS Syntax File ------------ From 8c69cb1b088e5e74a7574009c65c479063987eba Mon Sep 17 00:00:00 2001 From: juleswang Date: Tue, 27 Feb 2018 16:48:54 +0800 Subject: [PATCH 46/65] bugfix for issues in Vim github --- syntax/css.vim | 423 +++++++++++++++++++++++-------------------------- test.css | 43 ++++- 2 files changed, 236 insertions(+), 230 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 11b5023..d0ca2f7 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -4,16 +4,14 @@ " Claudio Fleiner (Maintainer) " Yeti (Add full CSS2, HTML4 support) " Nikolai Weibull (Add CSS2 support) -" Maintainer: Jules Wang " URL: https://github.com/JulesWang/css.vim -" Last Change: 2015 Aug.25 +" Maintainer: Jules Wang +" Last Change: 2018 Feb. 27 +" cssClassName updated by Ryuichi Hayashida Jan 2016 -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded +" quit when a syntax file was already loaded if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") + if exists("b:current_syntax") finish endif let main_syntax = 'css' @@ -59,7 +57,7 @@ syn match cssSelectorOp2 "[~|^$*]\?=" contained syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ " .class and #id -syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+" contains=cssClassNameDot +syn match cssClassName "\.-\=[A-Za-z_][A-Za-z0-9_-]*" contains=cssClassNameDot syn match cssClassNameDot contained '\.' try @@ -68,71 +66,14 @@ catch /^.*/ syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*" endtry -" digits and units -syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=%\=" contains=cssUnitDecorators -syn match cssValue contained transparent "[-+]\=\d\+\(\.\d*\)\=\([a-z]\+\)\=\>" contains=cssUnitDecorators,cssValueNumber - -syn match cssIncludeKeyword /@\(-[a-z]\+-\)\=\(media\|keyframes\|import\|charset\|namespace\|page\)/ contained -" @media -syn region cssInclude start=/@media\>/ end=/\ze{/ skipwhite skipnl contains=cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssIncludeKeyword,cssMediaComma,cssComment nextgroup=cssMediaBlock -syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained skipwhite skipnl -syn keyword cssMediaKeyword only not and contained -syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssTagName,cssClassName,cssIdentifier,cssPseudoClass,cssSelectorOp,cssSelectorOp2,cssAttributeSelector fold -syn match cssMediaComma "," skipwhite skipnl contained - -" Reference: http://www.w3.org/TR/css3-mediaqueries/ -syn keyword cssMediaProp contained width height orientation scan grid -syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/ -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 - -" @page -" http://www.w3.org/TR/css3-page/ -syn match cssPage "@page\>[^{]*{\@=" contains=cssPagePseudo,cssIncludeKeyword nextgroup=cssPageWrap transparent skipwhite skipnl -syn match cssPagePseudo /:\(left\|right\|first\|blank\)/ contained skipwhite skipnl -syn region cssPageWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssPageMargin,cssPageProp,cssAttrRegion,css.*Prop,cssComment,cssValue,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks -syn match cssPageMargin /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition skipwhite skipnl -syn keyword cssPageProp contained content size -" http://www.w3.org/TR/CSS2/page.html#break-inside -syn keyword cssPageProp contained orphans widows - -" @keyframe -" http://www.w3.org/TR/css3-animations/#keyframes -syn match cssKeyFrame "@\(-[a-z]\+-\)\=keyframes\>[^{]*{\@=" nextgroup=cssKeyFrameWrap contains=cssVendor,cssIncludeKeyword skipwhite skipnl transparent -syn region cssKeyFrameWrap contained transparent matchgroup=cssBraces start="{" end="}" contains=cssKeyFrameSelector -syn match cssKeyFrameSelector /\([-+]\=\d\+\(\.\d*\)\=%\|from\|to\)\=/ contained skipwhite skipnl nextgroup=cssDefinition - -" @import -syn region cssInclude start=/@import\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword,cssURL,cssMediaProp,cssValueLength,cssMediaKeyword,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType -syn region cssInclude start=/@charset\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword -syn region cssInclude start=/@namespace\>/ end=/\ze;/ transparent contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssIncludeKeyword - -" @font-face -" http://www.w3.org/TR/css3-fonts/#at-font-face-rule -syn match cssFontDescriptor "@font-face\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl -syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssComment,cssError,cssUnicodeEscape,cssCommonAttr,cssFontDescriptorProp,cssValue,cssFontDescriptorFunction,cssFontDescriptorAttr,cssNoise - -syn match cssFontDescriptorProp contained "\" -syn keyword cssFontDescriptorProp contained src -syn match cssFontDescriptorProp contained "\" -syn match cssFontDescriptorProp contained "\" -syn match cssFontDescriptorProp contained "\" - -" src functions -syn region cssFontDescriptorFunction contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline keepend -" font-sytle and font-weight attributes -syn keyword cssFontDescriptorAttr contained normal italic oblique bold -" font-stretch attributes -syn match cssFontDescriptorAttr contained "\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>" -" unicode-range attributes -syn match cssFontDescriptorAttr contained "U+[0-9A-Fa-f?]\+" -syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" -" font-feature-settings attributes -syn keyword cssFontDescriptorAttr contained on off - - +" 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\)\>" 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 +syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)\>" contains=cssUnitDecorators " The 16 basic color names syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal yellow @@ -180,11 +121,11 @@ syn match cssColor contained "\" syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" contains=cssUnitDecorators syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" contains=cssUnitDecorators -syn region cssURL contained matchgroup=cssFunctionName start="\" syn match cssFontAttr contained "\" syn match cssFontAttr contained "\" syn keyword cssFontAttr contained larger smaller syn match cssFontAttr contained "\<\(x\{1,2\}-\)\=\(large\|small\)\>" +syn match cssFontAttr contained "\" " font-family attributes syn match cssFontAttr contained "\<\(sans-\)\=serif\>" syn keyword cssFontAttr contained Antiqua Arial Black Book Charcoal Comic Courier Dingbats Gadget Geneva Georgia Grande Helvetica Impact Linotype Lucida MS Monaco Neue New Palatino Roboto Roman Symbol Tahoma Times Trebuchet Verdana Webdings Wingdings York Zapf @@ -329,7 +270,12 @@ syn match cssGeneratedContentProp contained "\" syn match cssGeneratedContentProp contained "\" syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>" -syn match cssGridProp contained "\" +" https://www.w3.org/TR/css-grid-1/ +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" +syn match cssGridProp contained "\" syn match cssHyerlinkProp contained "\" @@ -343,12 +289,12 @@ syn keyword cssListAttr contained inside outside syn keyword cssPositioningProp contained bottom clear clip display float left syn keyword cssPositioningProp contained position right top visibility syn match cssPositioningProp contained "\" -syn keyword cssPositioningAttr contained block compact +syn keyword cssPositioningAttr contained block compact grid syn match cssPositioningAttr contained "\" syn keyword cssPositioningAttr contained left right both syn match cssPositioningAttr contained "\" -syn match cssPositioningAttr contained "\" -syn keyword cssPositioningAttr contained static relative absolute fixed +syn match cssPositioningAttr contained "\" +syn keyword cssPositioningAttr contained static relative absolute fixed subgrid syn keyword cssPrintAttr contained landscape portrait crop cross always @@ -427,17 +373,16 @@ syn match cssUIProp contained "\" syn keyword cssUIAttr contained pixellated syn match cssUIAttr contained "\" -" Already highlighted Props: font content "------------------------------------------------ " Webkit/iOS specific attributes -syn match cssUIAttr contained '\(preserve-3d\)' +syn match cssUIAttr contained '\' " IE specific attributes -syn match cssIEUIAttr contained '\(bicubic\)' +syn match cssIEUIAttr contained '\' " Webkit/iOS specific properties -syn match cssUIProp contained '\(tap-highlight-color\|user-select\|touch-callout\)' +syn match cssUIProp contained '\' " IE specific properties -syn match cssIEUIProp contained '\(interpolation-mode\|zoom\|filter\)' +syn match cssIEUIProp contained '\' " Webkit/Firebox specific properties/attributes syn keyword cssUIProp contained appearance @@ -462,11 +407,25 @@ syn keyword cssAuralAttr contained male female child code digits continuous " mobile text syn match cssMobileTextProp contained "\" - +syn keyword cssMediaProp contained width height orientation scan grid +syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/ +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 /\d*%\|from\|to/ contained 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 +syn keyword cssFontDescriptorProp contained src +syn match cssFontDescriptorProp contained "\" +" unicode-range attributes +syn match cssFontDescriptorAttr contained "U+[0-9A-Fa-f?]\+" +syn match cssFontDescriptorAttr contained "U+\x\+-\x\+" syn match cssBraces contained "[{}]" syn match cssError contained "{@<>" -syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=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,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold syn match cssBraceError "}" syn match cssAttrComma "," @@ -498,7 +457,7 @@ syn region cssStringQQ start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=cssUnicodeEsc syn region cssStringQ start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=cssUnicodeEscape,cssSpecialCharQ " Vendor Prefix -syn match cssVendor contained "\(-\(webkit\|moz\|o\|ms\)-\)" +syn match cssVendor contained "-\(webkit\|moz\|o\|ms\)-" " Various CSS Hack characters " In earlier versions of IE (6 and 7), one can prefix property names @@ -510,11 +469,39 @@ 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 +syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\)/ contained contains=css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise " Hack for transition " '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 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 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 keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained + +" @page +" http://www.w3.org/TR/css3-page/ +syn region cssAtRule start=/@page\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssPagePseudo,cssComment nextgroup=cssDefinition +syn match cssPagePseudo /:\(left\|right\|first\|blank\)/ contained skipwhite skipnl +" @keyframe +" http://www.w3.org/TR/css3-animations/#keyframes +syn region cssAtRule start=/@\(-[a-z]\+-\)\=keyframes\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssVendor,cssComment nextgroup=cssDefinition + +syn region cssAtRule start=/@import\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword,cssURL,cssMediaProp,cssValueLength,cssAtRuleLogical,cssValueInteger,cssMediaAttr,cssMediaType +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 if main_syntax == "css" @@ -522,136 +509,126 @@ if main_syntax == "css" endif " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_css_syn_inits") - if version < 508 - let did_css_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink cssComment Comment - HiLink cssVendor Comment - HiLink cssHacks Comment - HiLink cssTagName Statement - HiLink cssDeprecated Error - HiLink cssSelectorOp Special - HiLink cssSelectorOp2 Special - HiLink cssAttrComma Special - - HiLink cssAnimationProp cssProp - HiLink cssAuralProp cssProp - HiLink cssBackgroundProp cssProp - HiLink cssBorderProp cssProp - HiLink cssBoxProp cssProp - HiLink cssColorProp cssProp - HiLink cssContentForPagedMediaProp cssProp - HiLink cssDimensionProp cssProp - HiLink cssFlexibleBoxProp cssProp - HiLink cssFontProp cssProp - HiLink cssGeneratedContentProp cssProp - HiLink cssGridProp cssProp - HiLink cssHyerlinkProp cssProp - HiLink cssIEUIProp cssProp - HiLink cssInteractProp cssProp - HiLink cssLineboxProp cssProp - HiLink cssListProp cssProp - HiLink cssMarqueeProp cssProp - HiLink cssMobileTextProp cssProp - HiLink cssMultiColumnProp cssProp - HiLink cssPagedMediaProp cssProp - HiLink cssPositioningProp cssProp - HiLink cssPrintProp cssProp - HiLink cssRenderProp cssProp - HiLink cssRubyProp cssProp - HiLink cssSpeechProp cssProp - HiLink cssTableProp cssProp - HiLink cssTextProp cssProp - HiLink cssTransformProp cssProp - HiLink cssTransitionProp cssProp - HiLink cssUIProp cssProp - - HiLink cssAnimationAttr cssAttr - HiLink cssAuralAttr cssAttr - HiLink cssBackgroundAttr cssAttr - HiLink cssBorderAttr cssAttr - HiLink cssBoxAttr cssAttr - HiLink cssContentForPagedMediaAttr cssAttr - HiLink cssCommonAttr cssAttr - HiLink cssDimensionAttr cssAttr - HiLink cssFlexibleBoxAttr cssAttr - HiLink cssFontAttr cssAttr - HiLink cssGeneratedContentAttr cssAttr - HiLink cssGridAttr cssAttr - HiLink cssHyerlinkAttr cssAttr - HiLink cssIEUIAttr cssAttr - HiLink cssInteractAttr cssAttr - HiLink cssLineboxAttr cssAttr - HiLink cssListAttr cssAttr - HiLink cssMarginAttr cssAttr - HiLink cssMarqueeAttr cssAttr - HiLink cssMultiColumnAttr cssAttr - HiLink cssPaddingAttr cssAttr - HiLink cssPagedMediaAttr cssAttr - HiLink cssPositioningAttr cssAttr - HiLink cssGradientAttr cssAttr - HiLink cssPrintAttr cssAttr - HiLink cssRenderAttr cssAttr - HiLink cssRubyAttr cssAttr - HiLink cssSpeechAttr cssAttr - HiLink cssTableAttr cssAttr - HiLink cssTextAttr cssAttr - HiLink cssTransformAttr cssAttr - HiLink cssTransitionAttr cssAttr - HiLink cssUIAttr cssAttr - - HiLink cssPseudoClassId PreProc - HiLink cssPseudoClassLang Constant - HiLink cssValueNumber Number - HiLink cssFunction Constant - HiLink cssURL String - HiLink cssFunctionName Function - HiLink cssFunctionComma Function - HiLink cssColor Constant - HiLink cssIdentifier Function - HiLink cssInclude Include - HiLink cssIncludeKeyword atKeyword - HiLink cssImportant Special - HiLink cssBraces Function - HiLink cssBraceError Error - HiLink cssError Error - HiLink cssUnicodeEscape Special - HiLink cssStringQQ String - HiLink cssStringQ String - HiLink cssAttributeSelector String - HiLink cssMedia atKeyword - HiLink cssMediaType Special - HiLink cssMediaComma Normal - HiLink cssMediaKeyword Statement - HiLink cssMediaProp cssProp - HiLink cssMediaAttr cssAttr - HiLink cssPage atKeyword - HiLink cssPagePseudo PreProc - HiLink cssPageMargin atKeyword - HiLink cssPageProp cssProp - HiLink cssKeyFrame atKeyword - HiLink cssKeyFrameSelector Constant - HiLink cssFontDescriptor Special - HiLink cssFontDescriptorFunction Constant - HiLink cssFontDescriptorProp cssProp - HiLink cssFontDescriptorAttr cssAttr - HiLink cssUnicodeRange Constant - HiLink cssClassName Function - HiLink cssClassNameDot Function - HiLink cssProp StorageClass - HiLink cssAttr Constant - HiLink cssUnitDecorators Number - HiLink cssNoise Noise - HiLink atKeyword PreProc - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet + +hi def link cssComment Comment +hi def link cssVendor Comment +hi def link cssHacks Comment +hi def link cssTagName Statement +hi def link cssDeprecated Error +hi def link cssSelectorOp Special +hi def link cssSelectorOp2 Special +hi def link cssAttrComma Special + +hi def link cssAnimationProp cssProp +hi def link cssBackgroundProp cssProp +hi def link cssBorderProp cssProp +hi def link cssBoxProp cssProp +hi def link cssColorProp cssProp +hi def link cssContentForPagedMediaProp cssProp +hi def link cssDimensionProp cssProp +hi def link cssFlexibleBoxProp cssProp +hi def link cssFontProp cssProp +hi def link cssGeneratedContentProp cssProp +hi def link cssGridProp cssProp +hi def link cssHyerlinkProp cssProp +hi def link cssInteractProp cssProp +hi def link cssLineboxProp cssProp +hi def link cssListProp cssProp +hi def link cssMarqueeProp cssProp +hi def link cssMultiColumnProp cssProp +hi def link cssPagedMediaProp cssProp +hi def link cssPositioningProp cssProp +hi def link cssPrintProp cssProp +hi def link cssRubyProp cssProp +hi def link cssSpeechProp cssProp +hi def link cssTableProp cssProp +hi def link cssTextProp cssProp +hi def link cssTransformProp cssProp +hi def link cssTransitionProp cssProp +hi def link cssUIProp cssProp +hi def link cssIEUIProp cssProp +hi def link cssAuralProp cssProp +hi def link cssRenderProp cssProp +hi def link cssMobileTextProp cssProp + +hi def link cssAnimationAttr cssAttr +hi def link cssBackgroundAttr cssAttr +hi def link cssBorderAttr cssAttr +hi def link cssBoxAttr cssAttr +hi def link cssContentForPagedMediaAttr cssAttr +hi def link cssDimensionAttr cssAttr +hi def link cssFlexibleBoxAttr cssAttr +hi def link cssFontAttr cssAttr +hi def link cssGeneratedContentAttr cssAttr +hi def link cssGridAttr cssAttr +hi def link cssHyerlinkAttr cssAttr +hi def link cssInteractAttr cssAttr +hi def link cssLineboxAttr cssAttr +hi def link cssListAttr cssAttr +hi def link cssMarginAttr cssAttr +hi def link cssMarqueeAttr cssAttr +hi def link cssMultiColumnAttr cssAttr +hi def link cssPaddingAttr cssAttr +hi def link cssPagedMediaAttr cssAttr +hi def link cssPositioningAttr cssAttr +hi def link cssGradientAttr cssAttr +hi def link cssPrintAttr cssAttr +hi def link cssRubyAttr cssAttr +hi def link cssSpeechAttr cssAttr +hi def link cssTableAttr cssAttr +hi def link cssTextAttr cssAttr +hi def link cssTransformAttr cssAttr +hi def link cssTransitionAttr cssAttr +hi def link cssUIAttr cssAttr +hi def link cssIEUIAttr cssAttr +hi def link cssAuralAttr cssAttr +hi def link cssRenderAttr cssAttr +hi def link cssCommonAttr cssAttr + +hi def link cssPseudoClassId PreProc +hi def link cssPseudoClassLang Constant +hi def link cssValueLength Number +hi def link cssValueInteger Number +hi def link cssValueNumber Number +hi def link cssValueAngle Number +hi def link cssValueTime Number +hi def link cssValueFrequency Number +hi def link cssFunction Constant +hi def link cssURL String +hi def link cssFunctionName Function +hi def link cssFunctionComma Function +hi def link cssColor Constant +hi def link cssIdentifier Function +hi def link cssAtRule Include +hi def link cssAtKeyword PreProc +hi def link cssImportant Special +hi def link cssBraces Function +hi def link cssBraceError Error +hi def link cssError Error +hi def link cssUnicodeEscape Special +hi def link cssStringQQ String +hi def link cssStringQ String +hi def link cssAttributeSelector String +hi def link cssMediaType Special +hi def link cssMediaComma Normal +hi def link cssAtRuleLogical Statement +hi def link cssMediaProp cssProp +hi def link cssMediaAttr cssAttr +hi def link cssPagePseudo PreProc +hi def link cssPageMarginProp cssAtKeyword +hi def link cssPageProp cssProp +hi def link cssKeyFrameProp Constant +hi def link cssFontDescriptor Special +hi def link cssFontDescriptorProp cssProp +hi def link cssFontDescriptorAttr cssAttr +hi def link cssUnicodeRange Constant +hi def link cssClassName Function +hi def link cssClassNameDot Function +hi def link cssProp StorageClass +hi def link cssAttr Constant +hi def link cssUnitDecorators Number +hi def link cssNoise Noise let b:current_syntax = "css" diff --git a/test.css b/test.css index 6e55e09..8715b89 100644 --- a/test.css +++ b/test.css @@ -1,3 +1,34 @@ +@media print { + /* hide navigation controls when printing */ + #navigation { display: none} + @media (max-width: 12cm) { + /* keep notes in flow when printing to narrow pages */ + .note { float: none } + } +} + + +@supports (-webkit-perspective: 20px) and (not (perspective: 20px)) and (not (display: none)) { + /* CSS declarations for this condition */ +} + + +/* Media query */ +@media screen and (min-width: 900px) { + .article { + padding: 1rem 3rem; + } +} + +/* Nested media query */ +@supports (display: none) { + @media screen and (min-width: 900px) { + article { + display: none; + } + } +} + /* @media tests*/ @media screen { * { font-family: sans-serif } @@ -17,7 +48,9 @@ @media all {} @media {} + @import url(example.css) screen and (color), projection and (color); + @import "example.css" screen and (color), projection and (color); @media screen and (color), projection and (color) {} @@ -60,7 +93,7 @@ screen and (min-width: 20em) {} animation-delay:10; } -@-webkit-keyframes custom-name-not-highlighted { +@-webkit-keyframes tv-name-not-highlighted { from { left: 0; top: 0; @@ -88,7 +121,7 @@ screen and (min-width: 20em) {} animation-timing-function: ease-out; } - 75.75% { + 25.75%, 75% { top: 75px; animation-timing-function: ease-in; } @@ -181,15 +214,13 @@ and (max-device-width:1024px) background-repeat: repeat-y; } - #issue42 { background-image: url('{!URLFOR($Resource.images)}/background.png'); background-image: url('{!URLFOR($Resource.images)}/background.png'), url('{!URLFOR($Resource.images)}/background.png') } /* @font-face test */ -@font-face -{ +@font-face { /* with a test comment */ font-family: myFirstFont, serif; src: url(ideal-sans-serif.woff) format("woff"), @@ -197,8 +228,6 @@ and (max-device-width:1024px) src: local(STIXGeneral), url(/stixfonts/STIXGeneral.otf); unicode-range: U+000-49F, U+2000-27FF, U+2900-2BFF, U+1D400-1D7FF, U+4??; font-weight:bold; - /* negative example */ - font-size: normal; } #issue54 { From b9c366c381ca0338f2c9d382b8b43e15c03c8aef Mon Sep 17 00:00:00 2001 From: juleswang Date: Tue, 27 Feb 2018 17:19:05 +0800 Subject: [PATCH 47/65] support RGBA hex format --- syntax/css.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index d0ca2f7..ecdbc17 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -118,8 +118,9 @@ syn match cssImportant contained "!\s*important\>" syn match cssColor contained "\" syn match cssColor contained "\" syn match cssColor contained "\" -syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>" contains=cssUnitDecorators -syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>" contains=cssUnitDecorators +syn match cssColor contained "#\x\{3,4\}\>" contains=cssUnitDecorators +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="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma From ba8bbee5697f42a61ffab60d8b013c218d9ac03d Mon Sep 17 00:00:00 2001 From: juleswang Date: Mon, 5 Mar 2018 18:46:18 +0800 Subject: [PATCH 48/65] fix and close #65 --- syntax/css.vim | 10 +++++----- test.css | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index ecdbc17..1c603d7 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -69,7 +69,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\)\>" 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*\)\=%" contains=cssUnitDecorators syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators @@ -273,10 +273,10 @@ syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>" " https://www.w3.org/TR/css-grid-1/ syn match cssGridProp contained "\" -syn match cssGridProp contained "\" +syn match cssGridProp contained "\" syn match cssGridProp contained "\" syn match cssGridProp contained "\" -syn match cssGridProp contained "\" +syn match cssGridProp contained "\" syn match cssHyerlinkProp contained "\" @@ -408,13 +408,13 @@ syn keyword cssAuralAttr contained male female child code digits continuous " mobile text syn match cssMobileTextProp contained "\" -syn keyword cssMediaProp contained width height orientation scan grid +syn keyword cssMediaProp contained width height orientation scan syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/ 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 /\d*%\|from\|to/ contained nextgroup=cssDefinition +syn match cssKeyFrameProp contained /\<\(from\|to\)\>/ 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 diff --git a/test.css b/test.css index 8715b89..66cae3b 100644 --- a/test.css +++ b/test.css @@ -254,3 +254,10 @@ and (max-device-width:1024px) height: +10.10px; height: -1000%; } + +#issue65 { + grid-template: auto 1fr; + grid-template-rows: auto 1fr; + grid-template-areas: auto 1fr; + grid-auto-rows: auto 1fr; +} From 768131774bfb8375fbb03510e2892d72e27777d2 Mon Sep 17 00:00:00 2001 From: Ash Searle Date: Thu, 15 Nov 2018 11:37:46 +0000 Subject: [PATCH 49/65] 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 50/65] 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 51/65] 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 52/65] 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 53/65] 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 54/65] 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 55/65] 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 56/65] 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 57/65] 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 58/65] 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 59/65] 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 60/65] 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 61/65] 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 62/65] 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 63/65] 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 64/65] 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 65/65] 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 ------------