From 6201df6009b3c70a2d064fc0caf9ac297017ba0b Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 7 Jul 2018 16:14:53 +1200
Subject: Simplify in/out indent for blocks

---
 vim/indent/perl.vim | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'vim/indent')

diff --git a/vim/indent/perl.vim b/vim/indent/perl.vim
index cd01f30b..aac8f818 100644
--- a/vim/indent/perl.vim
+++ b/vim/indent/perl.vim
@@ -83,36 +83,42 @@ function! GetPerlIndent(lnum)
   let l:pl = getline(l:pn)
   let l:pi = indent(l:pn)
 
-  " Get value of 'shiftwidth'
-  let l:sw = &shiftwidth ? &shiftwidth : &tabstop
+  " Just follow comment indent
+  if l:pl =~# '^\s*#'
+    return l:pi
+  endif
 
   " Get current line properties
   let l:cl = getline(a:lnum)
 
+  " Get value of 'shiftwidth'
+  let l:sw = &shiftwidth ? &shiftwidth : &tabstop
+
   " Base indent with any fractional indent removed
   let l:pb = l:pi - l:pi % l:sw
 
-  " Just follow comment indent
-  if l:pl =~# '^\s*#'
-    return l:pi
-
-  " Move out with closing brace
-  elseif l:cl =~# '^\s*[])}]'
-    return l:pb >= l:sw ? l:pb - l:sw : 0
-
-  " Move in after opening brace
-  elseif l:pl =~# '[{([]\s*$'
-    return l:pb + l:sw
+  " Handle open and closing brackets
+  let l:open = l:pl =~# '[{([]\s*$'
+  let l:shut = l:cl =~# '^\s*[])}]'
+  if l:open || l:shut
+    let l:in = l:pb
+    if l:open
+      let l:in = l:in + l:sw
+    endif
+    if l:shut
+      let l:in = l:in - l:sw
+    endif
+    return l:in > 0 ? l:in : 0
+  endif
 
   " Never continue after a semicolon or a double-underscore
-  elseif l:pl =~# '\;\s*$'
+  if l:pl =~# '\;\s*$'
         \ || l:pl =~# '__DATA__'
         \ || l:pl =~# '__END__'
     return l:pb
 
   " Line continuation hints
-  elseif l:pl =~# '[^])},]\s*$'
-        \ || l:cl =~# '^\s*\(and\|or\|xor\)'
+  elseif l:cl =~# '^\s*\(and\|or\|xor\)'
         \ || l:cl =~# '^\s*\(&&\|||\|//\)'
         \ || l:cl =~# '^\s*[?:=]'
     return l:pb + l:sw / 2
-- 
cgit v1.2.3