Support view block

This commit is contained in:
leafOfTree
2021-07-30 14:41:13 +08:00
parent cda82484d2
commit 3d2680a859
4 changed files with 12 additions and 7 deletions

View File

@@ -244,7 +244,7 @@ function! vue#LoadDefaultSyntax(group, syntax)
endif
endfor
if loaded
call vue#Log(a:syntax.': laod default')
call vue#Log(a:syntax.': load default')
else
call vue#Warn(a:syntax.': syntax not found in '.string(syntax_paths))
call vue#Warn(a:syntax.': load full instead')

View File

@@ -86,18 +86,23 @@ function! s:GetIndentByContext(tag, syntax)
let prevline = getline(s:PrevNonBlankNonComment(v:lnum))
let curline = getline(v:lnum)
" When not in <template>, set block tags indent to 0
if a:tag != 'template'
if curline =~ s:block_tag || prevline =~ s:block_tag
if a:tag == 'view'
" Support 'view' tag from mini-program
if curline =~ s:block_tag && empty(prevline)
let ind = 0
endif
else
elseif a:tag == 'template'
" When 'pug' syntax in <template>, set block tags indent to 0
if a:syntax == 'pug'
if curline =~ s:block_tag
let ind = 0
endif
endif
else
" When not in <template>, set block tags indent to 0
if curline =~ s:block_tag || prevline =~ s:block_tag
let ind = 0
endif
endif
return ind

View File

@@ -46,7 +46,7 @@ syntax region VueExpression
\ start="{{"
\ end="}}"
syntax region VueExpression
\ containedin=htmlTemplateBlock,pugTemplateBlock,VueValue,htmlString,htmlValue
\ containedin=VueValue,htmlString,htmlValue,.*TemplateBlock,html.*Block
\ contains=@simpleJavascriptExpression
\ matchgroup=VueBrace
\ start="{{"

View File

@@ -179,9 +179,9 @@ endfunction
function! VimVuePluginSyntaxMain(...)
call s:Init()
call s:SetBlockSyntax(s:config_syntax)
let syntax_list = vue#GetSyntaxList(s:config_syntax)
call s:LoadSyntaxList(syntax_list)
call s:SetBlockSyntax(s:config_syntax)
call s:SetIsKeyword()
call s:HighlightVueTag()
endfunction