mirror of
https://github.com/leafOfTree/vim-vue-plugin.git
synced 2025-12-08 21:54:46 +08:00
Fix indentation after empty tags for vim8.1
This commit is contained in:
@@ -23,7 +23,8 @@ let s:template_tag = '\v^\s*\<\/?template'
|
|||||||
let s:empty_tagname = '(area|base|br|col|embed|hr|input|img|keygen|link|meta|param|source|track|wbr)'
|
let s:empty_tagname = '(area|base|br|col|embed|hr|input|img|keygen|link|meta|param|source|track|wbr)'
|
||||||
let s:empty_tag = '\v\<'.s:empty_tagname.'[^/]*\>'
|
let s:empty_tag = '\v\<'.s:empty_tagname.'[^/]*\>'
|
||||||
let s:empty_tag_start = '\v\<'.s:empty_tagname.'[^\>]*$'
|
let s:empty_tag_start = '\v\<'.s:empty_tagname.'[^\>]*$'
|
||||||
let s:empty_tag_end = '\v^\s*[^\<\>\/]*\>\s*'
|
let s:empty_tag_end = '\v^\s*[^\<\>\/]*\/?\>\s*'
|
||||||
|
let s:tag_start = '\v^\s*\<\w*'
|
||||||
let s:tag_end = '\v^\s*\/?\>\s*'
|
let s:tag_end = '\v^\s*\/?\>\s*'
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
@@ -138,7 +139,7 @@ function! GetVueIndent()
|
|||||||
let [start, end] = s:PrevMultilineEmptyTag(v:lnum)
|
let [start, end] = s:PrevMultilineEmptyTag(v:lnum)
|
||||||
if end == prevlnum
|
if end == prevlnum
|
||||||
call vue#Log('previous line is a multiline empty tag')
|
call vue#Log('previous line is a multiline empty tag')
|
||||||
let ind = ind - &sw
|
let ind = indent(v:lnum - 1)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
elseif s:SynPug(cursyn)
|
elseif s:SynPug(cursyn)
|
||||||
@@ -224,17 +225,23 @@ function! s:SynVueScriptOrStyle(syn)
|
|||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! s:PrevMultilineEmptyTag(lnum)
|
function! s:PrevMultilineEmptyTag(lnum)
|
||||||
let lnum = a:lnum
|
let lnum = a:lnum - 1
|
||||||
let lnums = [0, 0]
|
let lnums = [0, 0]
|
||||||
while lnum > 0
|
while lnum > 0
|
||||||
let line = getline(lnum)
|
let line = getline(lnum)
|
||||||
if line =~? s:empty_tag_end
|
if line =~? s:empty_tag_end
|
||||||
let lnums[1] = lnum
|
let lnums[1] = lnum
|
||||||
endif
|
endif
|
||||||
if line =~? s:empty_tag_start
|
|
||||||
let lnums[0] = lnum
|
if line =~? s:tag_start
|
||||||
return lnums
|
if line =~? s:empty_tag_start
|
||||||
|
let lnums[0] = lnum
|
||||||
|
return lnums
|
||||||
|
else
|
||||||
|
return [0, 0]
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let lnum = lnum - 1
|
let lnum = lnum - 1
|
||||||
endwhile
|
endwhile
|
||||||
endfunction
|
endfunction
|
||||||
|
|||||||
Reference in New Issue
Block a user