Fix bug#16118

* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Return nil before
open-paren tokens when preceded by a open-paren, too.
(ruby-smie-rules): Handle virtual indentation after open-paren
tokens specially.  If there is code between it and eol, return the
column where is starts.

* test/indent/ruby.rb: New examples.

2 files changed, 39 insertions, 4 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 6f75b33af95..ffa12498de4 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-14  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * indent/ruby.rb: New examples.
+
 2013-12-12  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         * automated/python-tests.el (python-indent-dedenters-2): New test.
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 3c4d68a97bf..7b85899577c 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -45,10 +45,41 @@ foo = { a: b,
         a1: b1
       }
 
-foo({
-     a: b,
-     c: d
-   })
+foo({                           # bug#16118
+      a: b,
+      c: d
+    }
+   )                            # bug#16116
+
+bar = foo(
+        a, [
+          1,
+        ],
+        :qux => [
+          3
+        ]
+      )
+
+foo(
+  [
+    {
+      a: b
+    },
+  ],
+  {
+    c: d
+  }
+)
+
+foo([{
+       a: 2
+     },
+     {
+       b: 3
+     },
+     4
+    ]
+   )
 
 foo = [                         # ruby-deep-indent-disabled
   1