Add support for continuing lines ending in equals

mocoso · Jul 13, 2009 · 34a7858 · 34a7858
1 parent d2cc2f1
commit 34a7858
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Support/lib/rbeautify/config/ruby.rb b/Support/lib/rbeautify/config/ruby.rb
@@ -102,8 +102,8 @@
     :nest_except => [:double_quote, :single_quote, :regex, :back_tick])
 
   ruby.add_matcher(:continuing_line,
-                   /(,|\.|\+|-|=\>|&&|\|\||\\|==|\s\?|:)(\s*)?(#.*)?$/,
-                   /(^|(,|\.|\+|-|=\>|&&|\|\||\\|==|\s\?|:)(\s*)?)(#.*)?$/,
+                   /(,|\.|\+|-|=\>|=|&&|\|\||\\|==|\s\?|:)(\s*)?(#.*)?$/,
+                   /(^|(,|\.|\+|-|=\>|=|&&|\|\||\\|==|\s\?|:)(\s*)?)(#.*)?$/,
                    :indent_end_line => true,
                    :negate_ends_match => true,
                    :nest_except => [:continuing_line, :curly_bracket, :round_bracket, :square_bracket])

diff --git a/Support/spec/fixtures/ruby.yml b/Support/spec/fixtures/ruby.yml
@@ -287,4 +287,18 @@
   output: |
     foo = bar.collect { |paragraph|
       paragraph.strip
-    }.join("\n")
+    }.join("\n")
+
+- name: indent continuing lines ending in = and +
+  input: |
+    def foo
+    @bar ||=
+    1 +
+    2
+    end
+  output: |
+    def foo
+      @bar ||=
+        1 +
+        2
+    end