From ff26e4a44e1519af681dc5d30c15edd97f5da4b0 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 29 Jul 2020 18:05:17 -0400 Subject: [PATCH 01/36] Add filter functions --- syntax/css.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/css.vim b/syntax/css.vim index c9edf7b..4d5bd24 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -128,6 +128,7 @@ syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip 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 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y\|Z\)\=\|translate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|perspective\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(blur\|brightness\|contrast\|drop-shadow\|grayscale\|hue-rotate\|invert\|opacity\|saturate\|sepia\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma syn keyword cssGradientAttr contained top bottom left right cover center middle ellipse at syn match cssFunctionComma contained "," From c2039b7e1a27ce761172a23380affabdacaded82 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Aug 2020 08:59:24 -0400 Subject: [PATCH 02/36] Update header with new maintainer --- syntax/css.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index cd61998..55411d9 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -1,11 +1,12 @@ " Vim syntax file " Language: Cascading Style Sheets " Previous Contributor List: +" Jules Wang " Claudio Fleiner (Maintainer) " Yeti (Add full CSS2, HTML4 support) " Nikolai Weibull (Add CSS2 support) -" URL: https://github.com/JulesWang/css.vim -" Maintainer: Jules Wang +" URL: https://github.com/jsit/css.vim +" Maintainer: Jay Sitter " Last Change: 2019 Jul. 29 " quit when a syntax file was already loaded From 378764c7d79036f2af54d26940b2173c882170f9 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Tue, 4 Aug 2020 17:07:02 -0400 Subject: [PATCH 03/36] Add 'gap' CSS grid property Closes #2 --- syntax/css.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/css.vim b/syntax/css.vim index f915b4d..b4ce8cf 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -283,6 +283,7 @@ 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 "\" From bf4ede3aa95c19f75b6256fc15eacfbb15a2a6ee Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 9 Aug 2020 12:35:40 -0400 Subject: [PATCH 04/36] Update readme --- README.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d5a8792..199c035 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,30 @@ -Vim CSS Syntax File ------------- +# Vim CSS Syntax File -Installation -------------- +## Adding features -## Manual +The keywords in this plugin should be limited to those that appear in a W3C +document that has reached the level of Candidate Recommendation or higher. Check +[the "current work" page](https://www.w3.org/Style/CSS/current-work) for more +details. + +## Installation + +### Manual copy `css.vim` file into your `~/.vim/syntax/` directory; -## Using Vundle: +### Using Vundle: add the following line to your `~/.vimrc` file; ``` -Plugin 'JulesWang/css.vim' +Plugin 'jsit/css.vim' ``` and run `:PluginInstall` in vim. -Thanks ------------- +## Thanks +* JulesWang https://github.com/JulesWang/css.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 62b8e9221fafdcf252c8198050e66159a40eed20 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 9 Aug 2020 14:02:53 -0400 Subject: [PATCH 05/36] Update readme --- README.md | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 199c035..3ebaee0 100644 --- a/README.md +++ b/README.md @@ -11,20 +11,28 @@ details. ### Manual -copy `css.vim` file into your `~/.vim/syntax/` directory; +Copy `css.vim` file into your `~/.vim/syntax/` directory. -### Using Vundle: +### Using Vundle -add the following line to your `~/.vimrc` file; +Add the following line to your `~/.vimrc` file: ``` -Plugin 'jsit/css.vim' +Plugin 'vim-language-dept/css.vim' ``` -and run `:PluginInstall` in vim. +and run `:PluginInstall` in Vim. + +## More Info + +- https://www.w3.org/Style/2011/CSS-process +- https://www.w3.org/Style/CSS/current-work +- https://www.w3.org/Consortium/Process#candidate-rec +- https://developer.mozilla.org/en-US/docs/Web/CSS ## Thanks -* JulesWang https://github.com/JulesWang/css.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 + +- JulesWang https://github.com/JulesWang/css.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 5eb39edc9efe001682d289307e54090dfbf2a456 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 9 Aug 2020 14:03:38 -0400 Subject: [PATCH 06/36] Update URL --- syntax/css.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index b4ce8cf..7624047 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -5,7 +5,7 @@ " Claudio Fleiner (Maintainer) " Yeti (Add full CSS2, HTML4 support) " Nikolai Weibull (Add CSS2 support) -" URL: https://github.com/jsit/css.vim +" URL: https://github.com/vim-language-dept/css.vim " Maintainer: Jay Sitter " Last Change: 2019 Jul. 29 @@ -61,7 +61,7 @@ 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_@-]*" +syn match cssIdentifier "#[A-Za-zÀ-ÿ_@][A-Za-zÀ-ÿ0-9_@-]*" catch /^.*/ syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*" endtry From e647943d821718d0c39da7361d342932cf2165ce Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 9 Aug 2020 14:05:55 -0400 Subject: [PATCH 07/36] Update URLs --- README.md | 2 +- syntax/css.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ebaee0..580d837 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Copy `css.vim` file into your `~/.vim/syntax/` directory. Add the following line to your `~/.vimrc` file: ``` -Plugin 'vim-language-dept/css.vim' +Plugin 'vim-language-dept/css-syntax.vim' ``` and run `:PluginInstall` in Vim. diff --git a/syntax/css.vim b/syntax/css.vim index 7624047..52e0693 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -5,7 +5,7 @@ " Claudio Fleiner (Maintainer) " Yeti (Add full CSS2, HTML4 support) " Nikolai Weibull (Add CSS2 support) -" URL: https://github.com/vim-language-dept/css.vim +" URL: https://github.com/vim-language-dept/css-syntax.vim " Maintainer: Jay Sitter " Last Change: 2019 Jul. 29 From e273a8919821de9ec8d70ae9237aa6be754c4a92 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Thu, 5 Nov 2020 15:20:36 -0500 Subject: [PATCH 08/36] Remove real font names from cssFontAttr and add dash to iskeyword. Closes #6. --- syntax/css.vim | 6 +++--- test.css | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 52e0693..484233b 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -23,6 +23,8 @@ let s:cpo_save = &cpo set cpo&vim syn case ignore +" Add dash to allowed keyword characters. +syn iskeyword @,48-57,_,192-255,- " HTML4 tags syn keyword cssTagName abbr address area a b base @@ -234,9 +236,7 @@ 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 -syn keyword cssFontAttr contained cursive fantasy monospace +syn keyword cssFontAttr contained sans-serif serif cursive fantasy monospace " font-feature-settings attributes syn keyword cssFontAttr contained on off " font-stretch attributes diff --git a/test.css b/test.css index dcba24a..38cc7d8 100644 --- a/test.css +++ b/test.css @@ -293,3 +293,8 @@ and (max-device-width:1024px) padding: var(--pad, 10px 15px 20px); color: var(--foo, #7F583F); } + +#issue6 { + font-family: Roboto, Helvetica, test-serif, testing-sans-serif; + font-family: monospace, cursive, fantasy, serif, sans-serif +} From 397868aadf362929797b519025e18e83ffc45b54 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 13 Oct 2021 10:52:39 -0400 Subject: [PATCH 09/36] Add sticky position attribute value --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 52e0693..4d1259e 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -304,7 +304,7 @@ syn keyword cssPositioningAttr contained left right both syn match cssPositioningAttr contained "\" syn match cssPositioningAttr contained "\" syn match cssPositioningAttr contained "\" -syn keyword cssPositioningAttr contained static relative absolute fixed subgrid +syn keyword cssPositioningAttr contained static relative absolute fixed subgrid sticky syn keyword cssPrintAttr contained landscape portrait crop cross always From 0cd1fc42ac5dd73edfdd50ea3e378c7d57e28eed Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 13 Oct 2021 10:54:22 -0400 Subject: [PATCH 10/36] Add conic-gradient --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 04ee32f..4afc976 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -129,7 +129,7 @@ syn region cssURL contained matchgroup=cssFunctionName start="\<\(uri\|url\|loca 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 +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\|conic-\)\=\gradient\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y\|Z\)\=\|translate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|perspective\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma syn region cssFunction contained matchgroup=cssFunctionName start="\<\(blur\|brightness\|contrast\|drop-shadow\|grayscale\|hue-rotate\|invert\|opacity\|saturate\|sepia\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma syn keyword cssGradientAttr contained top bottom left right cover center middle ellipse at From 6c8bf2086b083b7f8ec6d7937d1b67922a4ffa99 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 13 Oct 2021 11:03:59 -0400 Subject: [PATCH 11/36] Add support for object-fit and object-position --- syntax/css.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/syntax/css.vim b/syntax/css.vim index 4afc976..16306c7 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -295,6 +295,10 @@ 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 +" object-fit https://www.w3.org/TR/css-images-3/#the-object-fit +syn match cssObjectProp contained "\" +syn keyword cssObjectAttr contained fill contain cover scale-down + syn keyword cssPositioningProp contained bottom clear clip display float left syn keyword cssPositioningProp contained position right top visibility syn match cssPositioningProp contained "\" @@ -549,6 +553,7 @@ hi def link cssMarqueeProp cssProp hi def link cssMultiColumnProp cssProp hi def link cssPagedMediaProp cssProp hi def link cssPositioningProp cssProp +hi def link cssObjectProp cssProp hi def link cssPrintProp cssProp hi def link cssRubyProp cssProp hi def link cssSpeechProp cssProp @@ -582,6 +587,7 @@ hi def link cssMultiColumnAttr cssAttr hi def link cssPaddingAttr cssAttr hi def link cssPagedMediaAttr cssAttr hi def link cssPositioningAttr cssAttr +hi def link cssObjectAttr cssAttr hi def link cssGradientAttr cssAttr hi def link cssPrintAttr cssAttr hi def link cssRubyAttr cssAttr From fafc6447c327c636d042fa3f8c55a95d3d0a4929 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 13 Oct 2021 11:05:44 -0400 Subject: [PATCH 12/36] Add space-evenly for flex --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 16306c7..3774547 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -222,7 +222,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 " http://www.w3.org/TR/css-fonts-3/ From d3233f48fc8a812c1f994a09c17178484c672e6a Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 13 Oct 2021 11:08:51 -0400 Subject: [PATCH 13/36] Add support for --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 3774547..2edf4a8 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -34,7 +34,7 @@ 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 pre q s samp script small +syn keyword cssTagName option p param picture 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 From c6c3ade376902415dd878aa7a2a1f44ec7102e06 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 13 Oct 2021 11:11:02 -0400 Subject: [PATCH 14/36] 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 2edf4a8..bcc945c 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -7,7 +7,7 @@ " Nikolai Weibull (Add CSS2 support) " URL: https://github.com/vim-language-dept/css-syntax.vim " Maintainer: Jay Sitter -" Last Change: 2019 Jul. 29 +" Last Change: 2021 Oct 13 " quit when a syntax file was already loaded if !exists("main_syntax") From ac66d0542eb0e27bae3c79cf9ce64d9bc03a6c4f Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 13 Oct 2021 11:14:03 -0400 Subject: [PATCH 15/36] Update contributors list --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index bcc945c..b9d1241 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -2,7 +2,7 @@ " Language: Cascading Style Sheets " Previous Contributor List: " Jules Wang -" Claudio Fleiner (Maintainer) +" Claudio Fleiner " Yeti (Add full CSS2, HTML4 support) " Nikolai Weibull (Add CSS2 support) " URL: https://github.com/vim-language-dept/css-syntax.vim From dd32b1e5388d909248e35d826458277caf5eddf2 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 20 Oct 2021 11:06:45 -0400 Subject: [PATCH 16/36] Add media query properties and values --- syntax/css.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index b9d1241..89bbf88 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -7,7 +7,7 @@ " Nikolai Weibull (Add CSS2 support) " URL: https://github.com/vim-language-dept/css-syntax.vim " Maintainer: Jay Sitter -" Last Change: 2021 Oct 13 +" Last Change: 2021 Oct 20 " quit when a syntax file was already loaded if !exists("main_syntax") @@ -423,11 +423,15 @@ syn keyword cssAuralAttr contained male female child code digits continuous syn match cssMobileTextProp contained "\" syn keyword cssMediaProp contained width height orientation scan +syn keyword cssMediaProp contained any-hover any-pointer color-gamut grid hover +syn keyword cssMediaProp contained overflow-block overflow-inline pointer update 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 keyword cssMediaAttr contained coarse fast fine hover infinite p3 paged +syn keyword cssMediaAttr contained rec2020 scroll slow srgb 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 From e108c3a992b8049f666b9d70ac05f361e86efbe5 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Wed, 10 Nov 2021 11:58:02 -0500 Subject: [PATCH 17/36] Update pseudo-classes --- syntax/css.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 89bbf88..e2f182e 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -449,17 +449,17 @@ syn match cssBraceError "}" syn match cssAttrComma "," " Pseudo class -" http://www.w3.org/TR/css3-selectors/ +" https://www.w3.org/TR/selectors-4/ syn match cssPseudoClass ":[A-Za-z0-9_-]*" contains=cssNoise,cssPseudoClassId,cssUnicodeEscape,cssVendor,cssPseudoClassFn syn keyword cssPseudoClassId contained link visited active hover before after left right -syn keyword cssPseudoClassId contained root empty target enable disabled checked invalid +syn keyword cssPseudoClassId contained root empty target enabled 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=")" contains=cssStringQ,cssStringQQ +syn match cssPseudoClassId contained "\" +syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ " ------------------------------------ " Vendor specific properties syn match cssPseudoClassId contained "\" -syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(input-\)\=placeholder\>" " Misc highlight groups From 660ca261f95342030dd155486a5d0aec30a127dd Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:08:40 -0500 Subject: [PATCH 18/36] Add flow-relative properties --- syntax/css.vim | 3 +++ test.css | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/syntax/css.vim b/syntax/css.vim index e2f182e..4b7527c 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -175,6 +175,8 @@ syn keyword cssBackgroundAttr contained cover contain syn match cssBorderProp contained "\" syn match cssBorderProp contained "\" +syn match cssBorderProp contained "\" +syn match cssBorderProp contained "\" syn match cssBorderProp contained "\" syn match cssBorderProp contained "\" syn match cssBorderProp contained "\" @@ -194,6 +196,7 @@ syn keyword cssBorderAttr contained clone slice syn match cssBoxProp contained "\" syn match cssBoxProp contained "\" +syn match cssBoxProp contained "\<\(margin\|padding\)\(-\(inline\|block\)\(-\(start\|end\)\)\)\=\>" syn match cssBoxProp contained "\" syn match cssBoxProp contained "\" syn keyword cssBoxAttr contained visible hidden scroll auto diff --git a/test.css b/test.css index 38cc7d8..f7f69dd 100644 --- a/test.css +++ b/test.css @@ -298,3 +298,28 @@ and (max-device-width:1024px) font-family: Roboto, Helvetica, test-serif, testing-sans-serif; font-family: monospace, cursive, fantasy, serif, sans-serif } + +#flow-relative { + border-inline: 20px solid blue; + border-inline-end: 40px solid blue; + border-inline-end-width: 0px; + border-start-start-radius: 20px; + border-end-end-radius: 20px; + border-start-end-radius: 20px; + border-end-start-radius: 20px; + + border-end: 20px; /* property shouldn't be highlighted */ + border-start-radius: 20px; /* property shouldn't be highlighted */ + + margin-block-end: 0px; + padding-block-end: 0px; + margin-inline-end: 0px; + padding-inline-end: 0px; + margin-block-start: 0px; + padding-block-start: 0px; + margin-inline-start: 0px; + padding-inline-start: 0px; + + margin-end: 0px; /* property shouldn't be highlighted */ + padding-end: 0px; /* property shouldn't be highlighted */ +} From 49d7b803a7b613852d3636dc442adcf3e78d4712 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:53:14 -0500 Subject: [PATCH 19/36] Add note about wd branch --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 580d837..c290085 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,13 @@ document that has reached the level of Candidate Recommendation or higher. Check [the "current work" page](https://www.w3.org/Style/CSS/current-work) for more details. +## Working Draft branch + +The `wd` branch contains specs that are in Working Draft status. Switch to this +branch for highlighting for things like ["flow-relative" +properties](https://www.w3.org/TR/css-logical-1/) that haven't made it into +Candidate Recommendation yet. + ## Installation ### Manual From 8abc95cbfff9cab33ce57ad03aaca9cc6cdb047f Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:53:33 -0500 Subject: [PATCH 20/36] Fix false positives on custom properties matches --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index e2f182e..aa18cb4 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -116,7 +116,7 @@ syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFac syn case ignore syn match cssImportant contained "!\s*important\>" -syn match cssCustomProp contained "--[a-zA-Z0-9-_]*" +syn match cssCustomProp contained "\<--[a-zA-Z0-9-_]*\>" syn match cssColor contained "\" syn match cssColor contained "\" From d5b69931723f95ab66b7b916b5a0d7284ed2c75d Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:54:00 -0500 Subject: [PATCH 21/36] Add math group region for parens inside calc() --- syntax/css.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/css.vim b/syntax/css.vim index aa18cb4..3440f52 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -126,6 +126,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 cssMathGroup contained matchgroup=cssMathParens start="(" end=")" containedin=cssFunction,cssMathGroup contains=cssCustomProp,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 From 89ce9eefa4ea874ad287c56732a513f627f99b95 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:54:20 -0500 Subject: [PATCH 22/36] Fix false positives for media properties --- syntax/css.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 3440f52..0027f8c 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -426,10 +426,10 @@ syn match cssMobileTextProp contained "\" syn keyword cssMediaProp contained width height orientation scan syn keyword cssMediaProp contained any-hover any-pointer color-gamut grid hover syn keyword cssMediaProp contained overflow-block overflow-inline pointer update -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 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 keyword cssMediaAttr contained coarse fast fine hover infinite p3 paged syn keyword cssMediaAttr contained rec2020 scroll slow srgb From 43c175f8e355f355755a519d3d9e916b7448603c Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:54:54 -0500 Subject: [PATCH 23/36] Add items to pseudoclass function contains --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 0027f8c..bb52ae1 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -457,7 +457,7 @@ syn keyword cssPseudoClassId contained root empty target enabled disabled checke syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(first\|last\|only\)-\(of-type\|child\)\>" syn match cssPseudoClassId contained "\" -syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ +syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ,cssTagName,cssAttributeSelector,cssClassName,cssIdentifier " ------------------------------------ " Vendor specific properties syn match cssPseudoClassId contained "\" From d6109ee9886a2c1894d30efc8334b6ec23123c66 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:53:14 -0500 Subject: [PATCH 24/36] Add note about wd branch --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 580d837..c290085 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,13 @@ document that has reached the level of Candidate Recommendation or higher. Check [the "current work" page](https://www.w3.org/Style/CSS/current-work) for more details. +## Working Draft branch + +The `wd` branch contains specs that are in Working Draft status. Switch to this +branch for highlighting for things like ["flow-relative" +properties](https://www.w3.org/TR/css-logical-1/) that haven't made it into +Candidate Recommendation yet. + ## Installation ### Manual From ed088fd12e84630475bff16d168d3b585fe3e220 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:53:33 -0500 Subject: [PATCH 25/36] Fix false positives on custom properties matches --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 4b7527c..3a5c7c6 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -116,7 +116,7 @@ syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFac syn case ignore syn match cssImportant contained "!\s*important\>" -syn match cssCustomProp contained "--[a-zA-Z0-9-_]*" +syn match cssCustomProp contained "\<--[a-zA-Z0-9-_]*\>" syn match cssColor contained "\" syn match cssColor contained "\" From 5b7a8dcf6fa722d81a53c2e18371c24b65370970 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:54:00 -0500 Subject: [PATCH 26/36] Add math group region for parens inside calc() --- syntax/css.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/css.vim b/syntax/css.vim index 3a5c7c6..e172338 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -126,6 +126,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 cssMathGroup contained matchgroup=cssMathParens start="(" end=")" containedin=cssFunction,cssMathGroup contains=cssCustomProp,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 From e76c02847d78608e6171f3c25a9802a765222a7a Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:54:20 -0500 Subject: [PATCH 27/36] Fix false positives for media properties --- syntax/css.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index e172338..5e7dd73 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -429,10 +429,10 @@ syn match cssMobileTextProp contained "\" syn keyword cssMediaProp contained width height orientation scan syn keyword cssMediaProp contained any-hover any-pointer color-gamut grid hover syn keyword cssMediaProp contained overflow-block overflow-inline pointer update -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 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 keyword cssMediaAttr contained coarse fast fine hover infinite p3 paged syn keyword cssMediaAttr contained rec2020 scroll slow srgb From 4e535a8f5b8502d39bcd103b4b67070e3221edcf Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 10:54:54 -0500 Subject: [PATCH 28/36] Add items to pseudoclass function contains --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 5e7dd73..0bc36ed 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -460,7 +460,7 @@ syn keyword cssPseudoClassId contained root empty target enabled disabled checke syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\<\(first\|last\|only\)-\(of-type\|child\)\>" syn match cssPseudoClassId contained "\" -syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ +syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ,cssTagName,cssAttributeSelector,cssClassName,cssIdentifier " ------------------------------------ " Vendor specific properties syn match cssPseudoClassId contained "\" From e1b5e3b303a17e9125a72f9555c52f8b8ef274b3 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 11:05:46 -0500 Subject: [PATCH 29/36] Fix false positives for UI props (word boundary) --- syntax/css.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index bb52ae1..73b7208 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -396,9 +396,9 @@ syn match cssUIAttr contained '\' syn match cssIEUIAttr contained '\' " Webkit/iOS specific properties -syn match cssUIProp contained '\' +syn match cssUIProp contained '\<\(tap-highlight-color\|user-select\|touch-callout\)\>' " IE specific properties -syn match cssIEUIProp contained '\' +syn match cssIEUIProp contained '\<\(interpolation-mode\|zoom\|filter\)\>' " Webkit/Firebox specific properties/attributes syn keyword cssUIProp contained appearance From ae1bc11af7ccd3f0a5275779261d110e26d9137e Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 9 Dec 2021 13:45:51 -0500 Subject: [PATCH 30/36] Fix empty lines --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 73b7208..564dc15 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -661,5 +661,5 @@ endif let &cpo = s:cpo_save unlet s:cpo_save -" vim: ts=8 +" vim: ts=8 From 60a21f3ef6a909883967c68edc5f9d0dce215ce0 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 23 Dec 2021 08:43:59 -0500 Subject: [PATCH 31/36] Fix column- and row-gap properties --- syntax/css.vim | 2 +- test.css | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 564dc15..fcda3a2 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -282,7 +282,7 @@ 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 "\<\(grid-\)\=\(column\|row\)\(-\(start\|end\|gap\)\)\=\>" syn match cssGridProp contained "\" syn match cssGridProp contained "\" syn match cssGridProp contained "\" diff --git a/test.css b/test.css index 38cc7d8..0901f08 100644 --- a/test.css +++ b/test.css @@ -298,3 +298,17 @@ and (max-device-width:1024px) font-family: Roboto, Helvetica, test-serif, testing-sans-serif; font-family: monospace, cursive, fantasy, serif, sans-serif } + +#grid { + gap: 20px; + row-gap: 20px; + column-gap: 20px; + + /** + * legacy gap properties -- should still highlight + * https://mapdashdev.wpengine.com/data-explorer/ + */ + grid-row-gap: 20px; + grid-column-gap: 20px; + grid-gap: 20px; +} From 557d214b488bc4dc98420ae4d9fae24cadd39b75 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 12 May 2022 12:46:37 -0400 Subject: [PATCH 32/36] Add cssURL to cssFunctionName contins --- syntax/css.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index fcda3a2..c89d194 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -127,7 +127,7 @@ 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 cssMathGroup contained matchgroup=cssMathParens start="(" end=")" containedin=cssFunction,cssMathGroup contains=cssCustomProp,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="\<\(var\|calc\)\s*(" end=")" contains=cssCustomProp,cssValue.*,cssFunction,cssURL,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-\|conic-\)\=\gradient\s*(" end=")" oneline contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma From 376efdd3058f920be21d32dedc7a261463f20491 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 12 May 2022 12:51:13 -0400 Subject: [PATCH 33/36] Add font-display property and values --- syntax/css.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index c89d194..d5d3432 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -227,7 +227,7 @@ syn match cssFlexibleBoxAttr contained "\" +syn match cssFontProp contained "\" " font attributes syn keyword cssFontAttr contained icon menu caption @@ -248,6 +248,8 @@ syn keyword cssFontAttr contained italic oblique syn keyword cssFontAttr contained weight style " font-weight attributes syn keyword cssFontAttr contained bold bolder lighter +" font-display attributes +syn keyword cssFontAttr contained auto block swap fallback optional " TODO: font-variant-* attributes "------------------------------------------------ From 156cee9e1113e4b59b5e2a89eb34d54efd3ff176 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 12 May 2022 13:10:52 -0400 Subject: [PATCH 34/36] Revert "Add font-display property and values" This reverts commit 376efdd3058f920be21d32dedc7a261463f20491. --- syntax/css.vim | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index d5d3432..c89d194 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -227,7 +227,7 @@ syn match cssFlexibleBoxAttr contained "\" +syn match cssFontProp contained "\" " font attributes syn keyword cssFontAttr contained icon menu caption @@ -248,8 +248,6 @@ syn keyword cssFontAttr contained italic oblique syn keyword cssFontAttr contained weight style " font-weight attributes syn keyword cssFontAttr contained bold bolder lighter -" font-display attributes -syn keyword cssFontAttr contained auto block swap fallback optional " TODO: font-variant-* attributes "------------------------------------------------ From 7b440b27e06f8dac462a21d99d1af0dfe731ab97 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Thu, 12 May 2022 13:11:13 -0400 Subject: [PATCH 35/36] Revert "Revert "Add font-display property and values"" This reverts commit 156cee9e1113e4b59b5e2a89eb34d54efd3ff176. --- syntax/css.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/syntax/css.vim b/syntax/css.vim index 647f88b..93a364b 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -230,7 +230,7 @@ syn match cssFlexibleBoxAttr contained "\" +syn match cssFontProp contained "\" " font attributes syn keyword cssFontAttr contained icon menu caption @@ -251,6 +251,8 @@ syn keyword cssFontAttr contained italic oblique syn keyword cssFontAttr contained weight style " font-weight attributes syn keyword cssFontAttr contained bold bolder lighter +" font-display attributes +syn keyword cssFontAttr contained auto block swap fallback optional " TODO: font-variant-* attributes "------------------------------------------------ From 5f1375f5abc63b13e7e5aada9ed2709c0d9d4cc3 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Tue, 12 Nov 2024 00:57:06 +1100 Subject: [PATCH 36/36] Add background-position-[xy] properties Fixes issue vim/vim#15968 --- syntax/css.vim | 4 ++-- test.css | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/syntax/css.vim b/syntax/css.vim index 93a364b..2bd152d 100644 --- a/syntax/css.vim +++ b/syntax/css.vim @@ -7,7 +7,7 @@ " Nikolai Weibull (Add CSS2 support) " URL: https://github.com/vim-language-dept/css-syntax.vim " Maintainer: Jay Sitter -" Last Change: 2021 Oct 20 +" Last Change: 2024 Nov 12 " quit when a syntax file was already loaded if !exists("main_syntax") @@ -160,7 +160,7 @@ syn keyword cssAnimationAttr contained infinite "------------------------------------------------ " CSS Backgrounds and Borders Module Level 3 " http://www.w3.org/TR/css3-background/ -syn match cssBackgroundProp contained "\" +syn match cssBackgroundProp contained "\" " background-attachment attributes syn keyword cssBackgroundAttr contained scroll fixed local diff --git a/test.css b/test.css index 0b99bf5..3eeb5d4 100644 --- a/test.css +++ b/test.css @@ -337,3 +337,9 @@ and (max-device-width:1024px) margin-end: 0px; /* property shouldn't be highlighted */ padding-end: 0px; /* property shouldn't be highlighted */ } + +/* Vim issue #15968 */ +#issue-vim-15968 { + background-position-x: 20px; + background-position-y: 20px; +}