aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-07 01:17:36 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-07 01:17:36 +1200
commit625a4dc4e8381b63134b1becce9172da22a363c5 (patch)
tree4c98460ec6e7bf25f459742e379d32d2b91f9b3d
parentRemove unneeded parens in Vim Perl indent script (diff)
downloaddotfiles-625a4dc4e8381b63134b1becce9172da22a363c5.tar.gz
dotfiles-625a4dc4e8381b63134b1becce9172da22a363c5.zip
Refactor rules in Vim Perl indent script
I think this is mixing two changes I made, which I neglected to commit separately.
-rw-r--r--vim/indent/perl.vim24
1 files changed, 6 insertions, 18 deletions
diff --git a/vim/indent/perl.vim b/vim/indent/perl.vim
index 443dc565..51e8b26c 100644
--- a/vim/indent/perl.vim
+++ b/vim/indent/perl.vim
@@ -34,27 +34,15 @@ function! GetPerlIndent()
if l:pl =~# '^\s*#'
return l:pi
- " After opening brace
- elseif l:pl =~# '[{([]\s*$'
-
- " Closing brace
- if l:cl =~# '^\s*[])}]'
- return l:pi
-
- " Block content
- else
- return l:pi + l:sw
- endif
-
" Entering closing brace
elseif l:cl =~# '^\s*[])}]'
+ return l:pi >= l:sw
+ \ ? l:pi - l:sw - l:pi % l:sw
+ \ : 0
- " Reduce indent if possible
- if l:pi >= l:sw
- return l:pi - l:sw
- else
- return 0
- endif
+ " After opening brace
+ elseif l:pl =~# '[{([]\s*$'
+ return l:pi + l:sw
" After a semicolon, comma, or closing brace
elseif l:pl =~# '[;,}]\s*$'