VimPlug/vim-haml
1
0
Fork 0
mirror of https://github.com/tpope/vim-haml.git synced 2025-12-07 17:54:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use shiftwidth() when available

Browse Source 
Closes https://github.com/tpope/vim-haml/issues/76
This commit is contained in:
Tim Pope
2016-02-11 12:43:59 -05:00
parent 7d86692010
commit 1f2e47c78c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indent/haml.vim
View File

@@ -37,10 +37,11 @@ function! GetHamlIndent()
let line = substitute(line,'^\s\+','','') let line = substitute(line,'^\s\+','','')
let indent = indent(lnum) let indent = indent(lnum)
let cindent = indent(v:lnum) let cindent = indent(v:lnum)
let sw = exists('*shiftwidth') ? shiftwidth() : &sw
if cline =~# '\v^-\s*%(elsif|else|when)>' if cline =~# '\v^-\s*%(elsif|else|when)>'
let indent = cindent < indent ? cindent : indent - &sw let indent = cindent < indent ? cindent : indent - sw
endif endif
let increase = indent + &sw let increase = indent + sw
if indent == indent(lnum) if indent == indent(lnum)
let indent = cindent <= indent ? -1 : increase let indent = cindent <= indent ? -1 : increase
endif endif

2
indent/sass.vim
View File

@@ -29,7 +29,7 @@ function! GetSassIndent()
let indent = indent(lnum) let indent = indent(lnum)
let cindent = indent(v:lnum) let cindent = indent(v:lnum)
if line !~ s:property && line !~ s:extend && cline =~ s:property if line !~ s:property && line !~ s:extend && cline =~ s:property
return indent + &sw return indent + (exists('*shiftwidth') ? shiftwidth() : &sw)
else else
return -1 return -1
endif endif