From 15ae2d70f30196d08c33eb40639ff52ccc469406 Mon Sep 17 00:00:00 2001
From: Andrew Radev <andrey.radev@gmail.com>
Date: Wed, 8 Aug 2012 13:31:44 +0300
Subject: [PATCH] Handling for multiline splats

---
 etc/examples/indent/splat.rb | 30 ++++++++++++++++++++++++++++++
 indent/ruby.vim              | 20 +++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 etc/examples/indent/splat.rb

diff --git a/etc/examples/indent/splat.rb b/etc/examples/indent/splat.rb
new file mode 100644
index 00000000..8fdb3371
--- /dev/null
+++ b/etc/examples/indent/splat.rb
@@ -0,0 +1,30 @@
+x = Foo[*
+  y do
+    z
+  end
+]
+
+x = Foo[* # with a comment
+  y do
+    z
+  end
+]
+
+x = *
+  array.map do
+  3
+end
+
+x = Foo[*
+  y {
+    z
+  }
+]
+
+x = Foo(*y do
+  z
+end)
+
+foo(1,
+    2,
+    *)
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 387899c2..f8549da7 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -90,6 +90,9 @@ let s:continuation_regex =
 " Regex that defines bracket continuations
 let s:bracket_continuation_regex = '%\@<!\%([({[]\)\s*\%(#.*\)\=$'
 
+" Regex that defines the first part of a splat pattern
+let s:splat_regex = '[[,(]\s*\*\s*\%(#.*\)\=$'
+
 " Regex that defines blocks.
 "
 " Note that there's a slight problem with this regex and s:continuation_regex.
@@ -156,7 +159,17 @@ function s:GetMSL(lnum)
     " Otherwise, terminate search as we have found our MSL already.
     let line = getline(lnum)
 
-    if line =~ s:non_bracket_continuation_regex && msl_body =~ s:non_bracket_continuation_regex
+    if line =~ s:splat_regex
+      " If the above line looks like the "*" of a splat, use the current one's
+      " indentation.
+      "
+      " Example:
+      "   Hash[*
+      "     method_call do
+      "       something
+      "
+      return msl
+    elseif line =~ s:non_bracket_continuation_regex && msl_body =~ s:non_bracket_continuation_regex
       " If the current line is a non-bracket continuation and so is the
       " previous one, keep its indent and continue looking for an MSL.
       "
@@ -351,6 +364,11 @@ function GetRubyIndent(...)
     return indent(s:GetMSL(lnum)) + &sw
   endif
 
+  " If the previous line ended with the "*" of a splat, add a level of indent
+  if line =~ s:splat_regex
+    return indent(lnum) + &sw
+  endif
+
   " If the previous line contained an opening bracket, and we are still in it,
   " add indent depending on the bracket type.
   if line =~ '[[({]'