Skip to content

Commit 6a82e5a

Browse files
committed
Some quick fixes for named css columns
I don't love some of the things I did with this fix, but it works for now. Given a lot of the new syntax changes over the years, it might be good to revisit some of this... if I have time...
1 parent 1c09c7b commit 6a82e5a

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

syntax/css.vim

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ setlocal iskeyword+=_
2828
" load this CSS plugin - I need to research more why the bug exists - perhaps
2929
" this is a better workaround
3030
syntax match cssAttr /\<cssAttrPolyfill\>/ contained
31-
syntax match cssBracketError /}\|]/ containedin=ALLBUT,cssComment
31+
syntax match cssBracketError /}\|]/ containedin=ALLBUT,cssComment,cssGridNamedColumns
3232
syntax match cssBrowserPrefix contained /\%(-webkit-\|-moz-\|-ms-\|-o-\)/ nextgroup=cssProp
3333
syntax match cssValueNoise contained /,/
3434

@@ -215,9 +215,12 @@ syntax match cssVariable contained /--[a-zA-Z0-9-_]\+/
215215

216216
syntax region cssCalcPrens contained start=/(/ end=/)/ matchgroup=cssFuncDelimiters contains=cssNumber,cssOperators,cssFuncVar,cssFuncName,cssCalcPrens extend keepend
217217

218+
syntax region cssGridNamedColumns matchgroup=cssGridNamedColumnBrackets contained start=/\[/ end=/\]/ contains=cssColumnName extend keepend
219+
syntax match cssColumnName contained /\<[a-zA-Z0-9-]\+\>/ extend
220+
218221
" syntax region cssFunction contained start=/\<[a-zA-Z0-9-]\+\>\+(/ end=/)/ contains=cssFuncName keepend
219222
syntax match cssFuncName /\<[a-zA-Z0-9-]\+\>(\@=/ nextgroup=cssFuncArgs,cssFuncUrlArgs,cssFuncVar,cssFuncAttrArgs,cssFuncEffectArgs,cssFuncCalcArgs
220-
syntax region cssFuncArgs contained matchgroup=cssFuncDelimiters start=/(/ end=/)/ contains=cssFunction,cssString,cssNumber,cssHexColor,cssColor,cssOperators,cssValueNoise,cssFuncCalcArgs,cssFuncName,cssSafeAreaInsets extend keepend
223+
syntax region cssFuncArgs contained matchgroup=cssFuncDelimiters start=/(/ end=/)/ contains=cssFunction,cssString,cssNumber,cssHexColor,cssColor,cssOperators,cssValueNoise,cssFuncCalcArgs,cssFuncName,cssSafeAreaInsets,cssFuncArgs extend keepend
221224
syntax region cssFuncUrlArgs contained matchgroup=cssFuncDelimiters start=/\%(url\)\@<=(/ end=/)/ contains=cssString extend keepend
222225
syntax region cssFuncAttrArgs contained matchgroup=cssFuncDelimiters start=/\%(attr\)\@<=(/ end=/)/ contains=cssAttrProp extend keepend
223226
syntax region cssFuncEffectArgs contained matchgroup=cssFuncDelimiters start=/\%(blur\|brightness\|contrast\|drop-shadow\|grayscale\|hue-rotate\|invert\|opacity\|saturate\|sepia\)\@<=(/ end=/)/ contains=cssNumber,cssColor
@@ -233,7 +236,7 @@ syntax match cssOperators contained /\%(+\|-\|*\|\/\)/
233236

234237
syntax cluster cssSelectors contains=cssTagSelector,cssIDSelector,cssSelectorOperator,cssSelectorSeparator,cssStarSelector,cssClassSelector,cssPseudoSelector,cssAttributeSelector,cssPseudoFunction
235238
syntax cluster cssRules contains=cssPropDefinition
236-
syntax cluster cssValues contains=cssFunction,cssString,cssNumber,cssHexColor,cssImportant,cssColor,cssValueKeyword,cssValueNoise,cssFuncName
239+
syntax cluster cssValues contains=cssFunction,cssString,cssNumber,cssHexColor,cssImportant,cssColor,cssValueKeyword,cssValueNoise,cssFuncName,cssGridNamedColumns
237240

238241
syntax region cssComment start=/\/\*/ end=/\*\// containedin=ALLBUT,cssComment keepend extend
239242

@@ -302,6 +305,8 @@ highlight default link cssVariableDefinition Special
302305
highlight default link cssVariable Special
303306
highlight default link cssSafeAreaInsets Special
304307
highlight default link cssClassSelectorEscapeChar Special
308+
highlight default link cssGridNamedColumnBrackets Operator
309+
highlight default link cssColumnName Special
305310

306311
let b:current_syntax = 'css'
307312

0 commit comments

Comments
 (0)