Mercurial > vim
changeset 34040:92fd65eac53a
runtime(sass): Provide sass_recommended_style option
Commit: https://github.com/vim/vim/commit/a907c91992167e41da41008d4370e434e324cbf2
Author: Tim Pope <code@tpope.net>
Date: Thu Dec 28 12:49:07 2023 -0500
runtime(sass): Provide sass_recommended_style option
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Dec 2023 23:30:06 +0100 |
| parents | 9828ad8d79bd |
| children | 4a67df32683d |
| files | runtime/ftplugin/sass.vim runtime/indent/sass.vim |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/ftplugin/sass.vim +++ b/runtime/ftplugin/sass.vim @@ -1,7 +1,7 @@ " Vim filetype plugin " Language: Sass " Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Last Change: 2019 Dec 05 +" Last Change: 2023 Dec 28 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -23,6 +23,11 @@ if &filetype =~# '\<s[ac]ss]\>' 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(\)\=["'']\='
--- a/runtime/indent/sass.vim +++ b/runtime/indent/sass.vim @@ -1,14 +1,14 @@ " Vim indent file " Language: Sass " Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Last Change: 2022 Mar 15 +" Last Change: 2023 Dec 28 if exists("b:did_indent") finish endif let b:did_indent = 1 -setlocal autoindent sw=2 et +setlocal autoindent setlocal indentexpr=GetSassIndent() setlocal indentkeys=o,O,*<Return>,<:>,!^F @@ -26,10 +26,8 @@ function! GetSassIndent() let lnum = prevnonblank(v:lnum-1) let line = substitute(getline(lnum),'\s\+$','','') let cline = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','') - let lastcol = strlen(line) let line = substitute(line,'^\s\+','','') let indent = indent(lnum) - let cindent = indent(v:lnum) if line !~ s:property && line !~ s:extend && cline =~ s:property return indent + shiftwidth() else