Skip to content

Commit a907c91

Browse files
tpopechrisbra
authored andcommitted
runtime(sass): Provide sass_recommended_style option
1 parent fda02d0 commit a907c91

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

runtime/ftplugin/sass.vim

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin
22
" Language: Sass
33
" Maintainer: Tim Pope <[email protected]>
4-
" Last Change: 2019 Dec 05
4+
" Last Change: 2023 Dec 28
55

66
" Only do this when not done yet for this buffer
77
if exists("b:did_ftplugin")
@@ -23,6 +23,11 @@ if &filetype =~# '\<s[ac]ss]\>'
2323
let b:undo_ftplugin .= ' isk<'
2424
endif
2525

26+
if get(g:, 'sass_recommended_style', 1)
27+
setlocal shiftwidth=2 softtabstop=2 expandtab
28+
let b:undo_ftplugin .= ' sw< sts< et<'
29+
endif
30+
2631
let &l:define = '^\C\v\s*%(\@function|\@mixin|\=)|^\s*%(\$[[:alnum:]-]+:|[%.][:alnum:]-]+\s*%(\{|$))@='
2732
let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
2833

runtime/indent/sass.vim

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
" Vim indent file
22
" Language: Sass
33
" Maintainer: Tim Pope <[email protected]>
4-
" Last Change: 2022 Mar 15
4+
" Last Change: 2023 Dec 28
55

66
if exists("b:did_indent")
77
finish
88
endif
99
let b:did_indent = 1
1010

11-
setlocal autoindent sw=2 et
11+
setlocal autoindent
1212
setlocal indentexpr=GetSassIndent()
1313
setlocal indentkeys=o,O,*<Return>,<:>,!^F
1414

@@ -26,10 +26,8 @@ function! GetSassIndent()
2626
let lnum = prevnonblank(v:lnum-1)
2727
let line = substitute(getline(lnum),'\s\+$','','')
2828
let cline = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')
29-
let lastcol = strlen(line)
3029
let line = substitute(line,'^\s\+','','')
3130
let indent = indent(lnum)
32-
let cindent = indent(v:lnum)
3331
if line !~ s:property && line !~ s:extend && cline =~ s:property
3432
return indent + shiftwidth()
3533
else

0 commit comments

Comments
 (0)