From 3d2680a8597d4009f12642490c8ba64a9eeca206 Mon Sep 17 00:00:00 2001
From: leafOfTree <node_github@163.com>
Date: Fri, 30 Jul 2021 14:41:13 +0800
Subject: [PATCH] Support view block

---
 autoload/vue.vim      |  2 +-
 indent/vue.vim        | 13 +++++++++----
 syntax/patch/html.vim |  2 +-
 syntax/vue.vim        |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/autoload/vue.vim b/autoload/vue.vim
index e357859..63675e3 100644
--- a/autoload/vue.vim
+++ b/autoload/vue.vim
@@ -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')
diff --git a/indent/vue.vim b/indent/vue.vim
index 162b7cf..3217ae2 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -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
diff --git a/syntax/patch/html.vim b/syntax/patch/html.vim
index e5b7527..0fe73c9 100644
--- a/syntax/patch/html.vim
+++ b/syntax/patch/html.vim
@@ -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="{{"
diff --git a/syntax/vue.vim b/syntax/vue.vim
index f731347..a7fe0ec 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -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