VimPlug/vim-vue-plugin
1
0
Fork 0
mirror of https://github.com/leafOfTree/vim-vue-plugin.git synced 2025-12-08 13:44:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix indent for blocks in template

Browse Source
This commit is contained in:
leafOfTree
2021-03-31 18:37:28 +08:00
parent 01e460244f
commit b617e1e110
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indent/vue.vim
View File

@@ -78,20 +78,23 @@ function! s:GetBlockIndent(syntax)
return ind
endfunction
function! s:GetIndentByContext(syntax)
function! s:GetIndentByContext(tag, syntax)
let ind = -1
let prevline = getline(s:PrevNonBlankNonComment(v:lnum))
let curline = getline(v:lnum)
" 0 for blocks except template as it can be nested
if curline =~ s:block_tag &&
\ (curline !~ s:template_tag || a:syntax == 'pug')
" When not in <template>, set block tags indent to 0
if a:tag != 'template'
if curline =~ s:block_tag || prevline =~ s:block_tag
let ind = 0
endif
endif
if prevline =~ s:block_tag && prevline !~ s:template_tag
let ind = 0
else
" When 'pug' syntax in <template>, set current line
if a:syntax == 'pug'
if curline =~ s:block_tag
let ind = 0
endif
endif
endif
return ind
@@ -191,8 +194,9 @@ function! s:AdjustHTMLIndent(ind)
endfunction
function! GetVueIndent()
let tag = vue#GetBlockTag(v:lnum)
let syntax = vue#GetBlockSyntax(v:lnum)
let ind = s:GetIndentByContext(syntax)
let ind = s:GetIndentByContext(tag, syntax)
if ind == -1
let ind = s:GetBlockIndent(syntax)
let ind = s:AdjustBlockIndent(syntax, ind)
@@ -201,7 +205,6 @@ function! GetVueIndent()
call vue#LogWithLnum('context, ind '.ind)
endif
let tag = vue#GetBlockTag(v:lnum)
let ind = s:CheckInitIndent(tag, ind)
return ind
endfunction