From c583d3a236b4fadabfc5ddf945de5f2ef55d64b0 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Thu, 22 Jul 2010 16:07:00 -0400 Subject: [PATCH] Highlight new style Sass variables --- syntax/sass.vim | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/syntax/sass.vim b/syntax/sass.vim index 1eab274..9543f1b 100644 --- a/syntax/sass.vim +++ b/syntax/sass.vim @@ -16,11 +16,12 @@ syn cluster sassCssAttributes contains=css.*Attr,cssComment,cssValue.*,cssColor, syn match sassProperty "^\s*\zs\s\%([[:alnum:]-]\+:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute syn match sassProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute -syn match sassCssAttribute ".*$" contained contains=@sassCssAttributes,sassConstant,sassFunction +syn match sassCssAttribute ".*$" contained contains=@sassCssAttributes,sassVariable,sassFunction syn match sassDefault "!default\>" contained -syn match sassConstant "!\%(important\>\|default\>\)\@![[:alnum:]_-]\+" -syn match sassConstant "$[[:alnum:]_-]\+" -syn match sassConstantAssignment "\%([!$][[:alnum:]_]\+\s*\)\@<=\%(||\)\==" nextgroup=sassCssAttribute skipwhite +syn match sassVariable "!\%(important\>\|default\>\)\@![[:alnum:]_-]\+" +syn match sassVariable "$[[:alnum:]_-]\+" +syn match sassVariableAssignment "\%([!$][[:alnum:]_-]\+\s*\)\@<=\%(||\)\==" nextgroup=sassCssAttribute skipwhite +syn match sassVariableAssignment "\%([!$][[:alnum:]_-]\+\s*\)\@<=:" nextgroup=sassCssAttribute skipwhite syn match sassFunction "\<\%(rgb\|rgba\|red\|green\|blue\|mix\)\>(\@=" contained syn match sassFunction "\<\%(hsl\|hsla\|hue\|saturation\|lightness\|adjust-hue\|lighten\|darken\|saturate\|desaturate\|grayscale\|complement\)\>(\@=" contained @@ -47,8 +48,8 @@ syn match sassAmpersand "&" " TODO: Arithmetic (including strings and concatenation) syn region sassInclude start="@import" end=";\|$" contains=cssComment,cssURL,cssUnicodeEscape,cssMediaType -syn region sassDebugLine matchgroup=sassDebug start="@debug\>" end="$" contains=@sassCssAttributes,sassConstant,sassFunction -syn region sassControlLine matchgroup=sassControl start="@\%(if\|else\%(\s\+if\)\=\|while\|for\)\>" end="$" contains=sassFor,@sassCssAttributes,sassConstant,sassFunction +syn region sassDebugLine matchgroup=sassDebug start="@debug\>" end="$" contains=@sassCssAttributes,sassVariable,sassFunction +syn region sassControlLine matchgroup=sassControl start="@\%(if\|else\%(\s\+if\)\=\|while\|for\)\>" end="$" contains=sassFor,@sassCssAttributes,sassVariable,sassFunction syn keyword sassFor from to through contained syn keyword sassTodo FIXME NOTE TODO OPTIMIZE XXX contained @@ -58,7 +59,7 @@ syn region sassCssComment start="^\z(\s*\)/\*" end="^\%(\z1 \)\@!" contains=sa hi def link sassCssComment sassComment hi def link sassComment Comment hi def link sassDefault cssImportant -hi def link sassConstant Identifier +hi def link sassVariable Identifier hi def link sassFunction Function hi def link sassMixing PreProc hi def link sassMixin PreProc