From 8f9e77eb238bb53946dcd1bfd35761f138766d15 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Tue, 15 Dec 2009 00:06:24 -0500 Subject: [PATCH] Begin laying groundwork for SassScript support --- indent/sass.vim | 2 +- syntax/sass.vim | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/indent/sass.vim b/indent/sass.vim index 45ca50f..94132ce 100644 --- a/indent/sass.vim +++ b/indent/sass.vim @@ -17,7 +17,7 @@ if exists("*GetSassIndent") finish endif -let s:property = '^\s*:\|^\s*[[:alnum:]-]\+:' +let s:property = '^\s*:\|^\s*[[:alnum:]-]\+\%(:\|\s*=\)' function! GetSassIndent() let lnum = prevnonblank(v:lnum-1) diff --git a/syntax/sass.vim b/syntax/sass.vim index 7e3c687..c15a366 100644 --- a/syntax/sass.vim +++ b/syntax/sass.vim @@ -15,9 +15,11 @@ syn cluster sassCssProperties contains=cssFontProp,cssFontDescriptorProp,cssColo syn cluster sassCssAttributes contains=css.*Attr,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp 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=sassScript syn match sassCssAttribute ".*$" contained contains=@sassCssAttributes,sassConstant +syn match sassScript ".*$" contained contains=@sassCssAttributes,sassConstant syn match sassConstant "![[:alnum:]_-]\+" -syn match sassConstantAssignment "\%(![[:alnum:]_]\+\s*\)\@<==" nextgroup=sassCssAttribute skipwhite +syn match sassConstantAssignment "\%(![[:alnum:]_]\+\s*\)\@<=\%(||\)\==" nextgroup=sassScript skipwhite syn match sassMixin "^=.*" syn match sassMixing "^\s\+\zs+.*"