summaryrefslogtreecommitdiff
path: root/runtime/indent/sass.vim
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/indent/sass.vim')
-rw-r--r--runtime/indent/sass.vim7
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/indent/sass.vim b/runtime/indent/sass.vim
index 4622f00ff..b6e2e66e8 100644
--- a/runtime/indent/sass.vim
+++ b/runtime/indent/sass.vim
@@ -1,7 +1,7 @@
" Vim indent file
" Language: Sass
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
-" Last Change: 2010 May 21
+" Last Change: 2013 May 30
if exists("b:did_indent")
finish
@@ -17,7 +17,8 @@ if exists("*GetSassIndent")
finish
endif
-let s:property = '^\s*:\|^\s*[[:alnum:]-]\+\%(:\|\s*=\)'
+let s:property = '^\s*:\|^\s*[[:alnum:]#{}-]\+\%(:\|\s*=\)'
+let s:extend = '^\s*\%(@extend\|@include\|+\)'
function! GetSassIndent()
let lnum = prevnonblank(v:lnum-1)
@@ -27,7 +28,7 @@ function! GetSassIndent()
let line = substitute(line,'^\s\+','','')
let indent = indent(lnum)
let cindent = indent(v:lnum)
- if line !~ s:property && cline =~ s:property
+ if line !~ s:property && line !~ s:extend && cline =~ s:property
return indent + &sw
"elseif line =~ s:property && cline !~ s:property
"return indent - &sw