From 95a095a4d29eaf0ba0851dcee5635053ec0f9f74 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Mon, 22 Aug 2022 15:15:04 -0400 Subject: [PATCH] Use recommended_style pattern for indenting defaults --- ftplugin/sass.vim | 5 +++++ indent/sass.vim | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim index 9ce4461..7b2b121 100644 --- a/ftplugin/sass.vim +++ b/ftplugin/sass.vim @@ -23,6 +23,11 @@ if &filetype =~# '\' let b:undo_ftplugin .= ' isk<' endif +if get(g:, 'sass_recommended_style', 1) + setlocal shiftwidth=2 softtabstop=2 expandtab + let b:undo_ftplugin .= ' sw< sts< et<' +endif + let &l:define = '^\C\v\s*%(\@function|\@mixin|\=)|^\s*%(\$[[:alnum:]-]+:|[%.][:alnum:]-]+\s*%(\{|$))@=' let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\=' diff --git a/indent/sass.vim b/indent/sass.vim index 33a464b..b62cb2d 100644 --- a/indent/sass.vim +++ b/indent/sass.vim @@ -8,7 +8,7 @@ if exists("b:did_indent") endif let b:did_indent = 1 -setlocal autoindent sw=2 et +setlocal autoindent setlocal indentexpr=GetSassIndent() setlocal indentkeys=o,O,*,<:>,!^F