From d9c0860388726135b29cbeb0d0dc7b9b089fc864 Mon Sep 17 00:00:00 2001
From: leafOfTree <node_github@163.com>
Date: Thu, 9 Jan 2020 12:58:33 +0800
Subject: [PATCH] Fix indentation after empty tags for vim8.1

---
 indent/vue.vim | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/indent/vue.vim b/indent/vue.vim
index 9434073..db520c8 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -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_tag = '\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*'
 "}}}
 
@@ -138,7 +139,7 @@ function! GetVueIndent()
       let [start, end] = s:PrevMultilineEmptyTag(v:lnum)
       if end == prevlnum
         call vue#Log('previous line is a multiline empty tag')
-        let ind = ind - &sw
+        let ind = indent(v:lnum - 1)
       endif
     endif
   elseif s:SynPug(cursyn)
@@ -224,17 +225,23 @@ function! s:SynVueScriptOrStyle(syn)
 endfunction
 
 function! s:PrevMultilineEmptyTag(lnum)
-  let lnum = a:lnum
+  let lnum = a:lnum - 1
   let lnums = [0, 0]
   while lnum > 0
     let line = getline(lnum)
     if line =~? s:empty_tag_end
       let lnums[1] = lnum
     endif
-    if line =~? s:empty_tag_start
-      let lnums[0] = lnum
-      return lnums
+
+    if line =~? s:tag_start
+      if line =~? s:empty_tag_start
+        let lnums[0] = lnum
+        return lnums
+      else
+        return [0, 0]
+      endif
     endif
+
     let lnum = lnum - 1
   endwhile
 endfunction