Commit: runtime(css): improve cssBoxProp matches

2 views
Skip to first unread message

Christian Brabandt

unread,
Nov 13, 2025, 7:26:57 AM (10 days ago) Nov 13
to vim...@googlegroups.com
runtime(css): improve cssBoxProp matches

Commit: https://github.com/vim/vim/commit/f85951fee0e3ccd48ccfaeec9c09f96e325925d1
Author: Neil Lambert <nlam...@pm.me>
Date: Tue Nov 11 18:01:31 2025 +0000

runtime(css): improve cssBoxProp matches

closes: https://github.com/vim/vim/issues/18717

Signed-off-by: Neil Lambert <nlam...@pm.me>
Signed-off-by: Jay Sitter <js...@users.noreply.github.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index b7e22e202..fd371d6af 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -13,6 +13,7 @@ nsis/lang/russian.nsi @RestorerZ
runtime/autoload/freebasic.vim @dkearns
runtime/autoload/hare.vim @selenebun
runtime/autoload/hcl.vim @gpanders
+runtime/autoload/javascriptcomplete.vim @jsit
runtime/autoload/modula2.vim @dkearns
runtime/autoload/rubycomplete.vim @segfault @dkearns
runtime/autoload/rust.vim @lilyball
@@ -463,6 +464,7 @@ runtime/syntax/chuck.vim @andreacfromtheapp
runtime/syntax/clojure.vim @axvr
runtime/syntax/codeowners.vim @jparise
runtime/syntax/cs.vim @nickspoons
+runtime/syntax/css.vim @jsit
runtime/syntax/csv.vim @habamax
runtime/syntax/cucumber.vim @tpope
runtime/syntax/d.vim @JesseKPhillips
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index f4d09cfa4..da3f3c73f 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -8,6 +8,7 @@
" URL: https://github.com/vim-language-dept/css-syntax.vim
" Maintainer: Jay Sitter <j...@jaysitter.com>
" Last Change: 2024 Mar 2
+" 2025 Nov 11: improve support for cssBoxProperties #18717

" quit when a syntax file was already loaded
if !exists("main_syntax")
@@ -197,7 +198,7 @@ syn keyword cssBorderAttr contained clone slice

syn match cssBoxProp contained "\<padding\(-\(top\|right\|bottom\|left\)\)\=\>"
syn match cssBoxProp contained "\<margin\(-\(top\|right\|bottom\|left\)\)\=\>"
-syn match cssBoxProp contained "\<\(margin\|padding\)\(-\(inline\|block\)\(-\(start\|end\)\)\)\=\>"
+syn match cssBoxProp contained "\<\(margin\|padding\)\(-\(inline\|block\)\(-\(start\|end\)\)\=\)\=\>"
syn match cssBoxProp contained "\<overflow\(-\(x\|y\|style\)\)\=\>"
syn match cssBoxProp contained "\<rotation\(-point\)\=\>"
syn keyword cssBoxAttr contained visible hidden scroll auto
diff --git a/runtime/syntax/testdir/dumps/css_1_00.dump b/runtime/syntax/testdir/dumps/css_1_00.dump
new file mode 100644
index 000000000..5590798ca
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/css_1_00.dump
@@ -0,0 +1,20 @@
+>d+0#af5f00255#ffffff0|i|v| +0#0000000&|{+0#00e0e07&| +0#0000000&@69
+@2|m+0#00e0003&|a|r|g|i|n|-|b|l|o|c|k|:+0#0000000&| |1+0#e000002&|p|x|;+0#0000000&| @54
+@2|m+0#00e0003&|a|r|g|i|n|-|b|l|o|c|k|-|s|t|a|r|t|:+0#0000000&| |1+0#e000002&|p|x|;+0#0000000&| @48
+@2|m+0#00e0003&|a|r|g|i|n|-|b|l|o|c|k|-|e|n|d|:+0#0000000&| |1+0#e000002&|p|x|;+0#0000000&| @50
+|}+0#00e0e07&| +0#0000000&@73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1|
diff --git a/runtime/syntax/testdir/input/css_1.css b/runtime/syntax/testdir/input/css_1.css
new file mode 100644
index 000000000..70a14127c
--- /dev/null
+++ b/runtime/syntax/testdir/input/css_1.css
@@ -0,0 +1,5 @@
+div {
+ margin-block: 1px;
+ margin-block-start: 1px;
+ margin-block-end: 1px;
+}
Reply all
Reply to author
Forward
0 new messages