VimPlug/vim-vue-plugin
1
0 Fork 0
mirror of https://github.com/leafOfTree/vim-vue-plugin.git synced 2026-11-02 02:17:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support shiftwidth=0 in indent and fold

Browse Source 
With shiftwidth=0, Vim uses the value of tabstop, but &sw is 0. So
multiline tags and brackets got wrong indent, and fold levels were wrong
as indent was divided by 0. Use shiftwidth() instead, which is the same
as &sw when it isn't 0.
This commit is contained in:
leafOfTree committed 2026-10-21 12:11:58 +00:00
1 parent ee1a608c40
commit abb7144824
4 files changed
+50 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

indent/vue.vim
+14 -14
View File
@@ -148,7 +148,7 @@ function! s:CheckInitialIndent(tag, syntax, ind)
endif
if add
call vue#LogWithLnum('add initial indent')
let ind = &sw
let ind = shiftwidth()
endif
return ind
endfunction
@@ -183,16 +183,16 @@ function! s:AdjustHTMLIndent(ind)
if prevline =~? s:empty_tag
call vue#LogWithLnum('previous line is an empty tag')
let ind = ind - &sw
let ind = ind - shiftwidth()
endif
" Align '/>' and '>' with '<'
if curline =~? s:tag_end
let ind = ind - &sw
let ind = ind - shiftwidth()
endif
" Then correct the indentation of any element following '/>' or '>'.
if prevline =~? s:tag_end
let ind = ind + &sw
let ind = ind + shiftwidth()
" Decrease indent if prevlines are a multiline empty tag
let [start, end] = s:PrevMultilineEmptyTag(v:lnum)
@@ -200,7 +200,7 @@ function! s:AdjustHTMLIndent(ind)
call vue#LogWithLnum('previous line is a multiline empty tag')
let ind = indent(v:lnum - 1)
if curline =~? s:full_tag_end
let ind = ind - &sw
let ind = ind - shiftwidth()
endif
endif
endif
@@ -210,17 +210,17 @@ function! s:AdjustHTMLIndent(ind)
" ]
if prevline =~ '[[{]\s*$'
call vue#LogWithLnum('previous line is an open bracket')
let ind = indent(prevlnum) + &sw
let ind = indent(prevlnum) + shiftwidth()
endif
if curline =~ '^\s*[]}][^"]*"\?\s*$'
call vue#LogWithLnum('current line is a closing bracket')
let ind = indent(prevlnum) - &sw
let ind = indent(prevlnum) - shiftwidth()
endif
" Multiline ternary 'a ? b : c' in attribute
if curline =~ s:ternary_q
call vue#LogWithLnum('current line is ?...')
let ind = indent(prevlnum) + &sw
let ind = indent(prevlnum) + shiftwidth()
endif
if curline =~ s:ternary_e && prevline =~ s:ternary_q
call vue#LogWithLnum('current line is :...')
@@ -228,13 +228,13 @@ function! s:AdjustHTMLIndent(ind)
endif
if prevline =~ s:ternary_e
call vue#LogWithLnum('prevline line is :...')
let ind = indent(prevlnum) - &sw
let ind = indent(prevlnum) - shiftwidth()
endif
" Angle bracket in attribute, like v-if="isEnabled('item.<name>')"
if prevline =~ '="[^"]*<[^"]*>[^"]*"'
call vue#LogWithLnum('prevline line is angle bracket in attribute')
let ind = ind - &sw
let ind = ind - shiftwidth()
endif
return ind
@@ -248,7 +248,7 @@ function! s:AdjustJavaScriptIndent(ind)
if prevline =~ '^\s*\w.*$' && curline =~ '^\s*\.'
call vue#LogWithLnum('current line is the first chain call')
let ind = indent(prevlnum) + &sw
let ind = indent(prevlnum) + shiftwidth()
endif
if prevline =~ '\s=>\s.*,\s*$' && curline !~ '^\s*[]}])\?,\?\s*$'
@@ -257,7 +257,7 @@ function! s:AdjustJavaScriptIndent(ind)
endif
if prevline =~ '\s||\s*$'
call vue#LogWithLnum('previous line ends with "||"')
let ind = indent(prevlnum) + &sw
let ind = indent(prevlnum) + shiftwidth()
endif
return ind
endfunction
@@ -270,11 +270,11 @@ function! s:AdjustCSSIndent(ind)
if prevline =~ ':\s.*,\s*$'
call vue#LogWithLnum('previous line is css function')
let ind = indent(prevlnum) + &sw
let ind = indent(prevlnum) + shiftwidth()
endif
if curline =~ '^\s*);\?\s*$'
call vue#LogWithLnum('curline is closing round bracket')
let ind = indent(prevlnum) - &sw
let ind = indent(prevlnum) - shiftwidth()
endif
return ind
endfunction