Merge branch 'fix-def-indentation'

AndrewRadev · AndrewRadev · commit 66482878d967 · 2012-04-21T15:25:07.000+03:00
diff --git a/etc/examples/indent/end_constructs.rb b/etc/examples/indent/end_constructs.rb
@@ -0,0 +1,19 @@
+module Foo
+  class Bar
+    f do
+      g { def h; end }
+    end
+
+    if foo
+      bar ; end
+
+    if bar ; end
+
+    foo do
+      foo = 3 . class
+      foo = lambda { class One; end }
+      foo = lambda { |args| class One; end }
+      foo = bar; class One; end
+    end
+  end
+end
diff --git a/indent/ruby.vim b/indent/ruby.vim
@@ -63,10 +63,9 @@ let s:ruby_deindent_keywords =
 " Regex that defines the start-match for the 'end' keyword.
 "let s:end_start_regex = '\%(^\|[^.]\)\<\%(module\|class\|def\|if\|for\|while\|until\|case\|unless\|begin\|do\)\>'
 " TODO: the do here should be restricted somewhat (only at end of line)?
-let s:end_start_regex = '^\s*\zs\<\%(module\|class\|def\|if\|for' .
-      \ '\|while\|until\|case\|unless\|begin\):\@!\>' .
-      \ '\|\%([=,*/%+-]\|<<\|>>\|:\s\)\s*\zs' .
-      \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>' .
+let s:end_start_regex =
+      \ '\%(^\s*\|[=,*/%+\-|;{]\|<<\|>>\|:\s\)\s*\zs' .
+      \ '\<\%(module\|class\|def\|if\|for\|while\|until\|case\|unless\|begin\):\@!\>' .
       \ '\|\<do:\@!\>'
 
 " Regex that defines the middle-match for the 'end' keyword.
