Fixes to closing bracket handler

AndrewRadev · AndrewRadev · commit f27d520ca79b · 2012-10-14T18:48:49.000+03:00
Only match closing brackets that are at the end of a line, and get the
right bracket position.

This still doesn't handle the actual line where the brackets are closed,
just the following one.
diff --git a/etc/examples/indent/closing_brackets.rb b/etc/examples/indent/closing_brackets.rb
@@ -1,16 +1,16 @@
 [1, [2,
      [3],
      3],
-4]
+     4]
 
 [1, [2,
      3],
-4]
+     4]
 
 [1, {2 =>
      3},
-4]
+       4]
 
 [1, f(2,
       3),
-4]
+      4]
diff --git a/indent/ruby.vim b/indent/ruby.vim
@@ -413,7 +413,7 @@ function GetRubyIndent(...)
   "
   " If it contained hanging closing brackets, find the rightmost one, find its
   " match and indent according to that.
-  if line =~ '[][(){}]'
+  if line =~ '[[({]' || line =~ '[])}]\s*\%(#.*\)\=$'
     let [opening, closing] = s:ExtraBrackets(lnum)
 
     if opening.pos != -1
@@ -428,7 +428,7 @@ function GetRubyIndent(...)
         return nonspace > 0 ? nonspace : ind + &sw
       endif
     elseif closing.pos != -1
-      call cursor(lnum, closing.pos)
+      call cursor(lnum, closing.pos + 1)
       normal! %
       return indent('.')
     else

-Original file line number
+Diff line change
@@ @@ -1,16 +1,16 @@ @@
 [1, [2,
      [3],
 ],
 -4]
 +     4]
 [1, [2,
 ],
 -4]
 +     4]
 [1, {2 =>
 },
 -4]
 +       4]
 [1, f(2,
 ),
 -4]
 +      4]