From eda351ca897ca0270ed8b01798af3679914683a1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 10 Mar 2021 17:22:05 +0100
Subject: Update

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

(limited to 'indent/svelte.vim')

diff --git a/indent/svelte.vim b/indent/svelte.vim
index fa01f563..cb01c424 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -12,12 +12,6 @@ if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/html.vim
-unlet! b:did_indent
-
-let s:html_indent = &l:indentexpr
-let b:did_indent = 1
-
 if !exists('g:svelte_indent_script')
   let g:svelte_indent_script = 1
 endif
@@ -26,6 +20,25 @@ if !exists('g:svelte_indent_style')
   let g:svelte_indent_style = 1
 endif
 
+" Try to mirror Svelte's indent settings so the HTML indenting scripts match.
+if g:svelte_indent_script
+  let b:html_indent_script1 = "inc"
+else
+  let b:html_indent_script1 = "zero"
+endif
+
+if g:svelte_indent_style
+  let b:html_indent_style1 = "inc"
+else
+  let b:html_indent_style1 = "zero"
+endif
+
+runtime! indent/html.vim
+unlet! b:did_indent
+
+let s:html_indent = &l:indentexpr
+let b:did_indent = 1
+
 setlocal indentexpr=GetSvelteIndent()
 setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],!^F,;,=:else,=:then,=:catch,=/if,=/each,=/await
 
-- 
cgit v1.2.3