Merge pull request #2873 from jonas054/2845_multiline_method_call_paren

[Fix #2845] Handle heredocs in MultilineLiteralBraceLayout auto-correct
rubocop · Feb 23, 2016 · da1f7ab · da1f7ab
2 parents 5ce3274 + aa9f2cd
commit da1f7ab
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@
 * [#2861](https://github.com/bbatsov/rubocop/pull/2861): Fix false positive in `Style/SpaceAroundKeyword` for `rescue(...`. ([@rrosenblum][])
 * [#2832](https://github.com/bbatsov/rubocop/issues/2832): `Style/MultilineOperationIndentation` treats operations inside blocks inside other operations correctly. ([@jonas054][])
 * [#2865](https://github.com/bbatsov/rubocop/issues/2865): Change `require:` in config to be relative to the `.rubocop.yml` file itself. ([@ptarjan][])
+* [#2845](https://github.com/bbatsov/rubocop/issues/2845): Handle heredocs in `Style/MultilineLiteralBraceLayout` auto-correct. ([@jonas054][])
+* [#2848](https://github.com/bbatsov/rubocop/issues/2848): Handle comments inside arrays in `Style/MultilineArrayBraceLayout` auto-correct. ([@jonas054][])
 
 ## 0.37.2 (11/02/2016)
 

diff --git a/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb b/lib/rubocop/cop/mixin/multiline_literal_brace_layout.rb
@@ -27,12 +27,12 @@ def autocorrect(node)
             corrector.insert_before(node.loc.end, "\n".freeze)
           end
         else
-          range = Parser::Source::Range.new(
-            node.source_range.source_buffer,
-            children(node).last.source_range.end_pos,
-            node.loc.end.begin_pos)
-
-          ->(corrector) { corrector.remove(range) }
+          lambda do |corrector|
+            corrector.remove(range_with_surrounding_space(node.loc.end,
+                                                          :left))
+            corrector.insert_after(children(node).last.source_range,
+                                   node.loc.end.source)
+          end
         end
       end
 

diff --git a/spec/rubocop/cop/style/multiline_array_brace_layout_spec.rb b/spec/rubocop/cop/style/multiline_array_brace_layout_spec.rb
@@ -54,11 +54,11 @@
     end
 
     it 'autocorrects closing brace on different line from last element' do
-      new_source = autocorrect_source(cop, ['[a,',
-                                            'b',
+      new_source = autocorrect_source(cop, ['[a, # a',
+                                            'b # b',
                                             ']'])
 
-      expect(new_source).to eq("[a,\nb]")
+      expect(new_source).to eq("[a, # a\nb] # b")
     end
   end
 

diff --git a/spec/rubocop/cop/style/multiline_method_call_brace_layout_spec.rb b/spec/rubocop/cop/style/multiline_method_call_brace_layout_spec.rb
@@ -101,5 +101,15 @@
 
       expect(new_source).to eq("foo(\n1,\n2\n)")
     end
+
+    it 'autocorrects method call with heredoc' do
+      new_source = autocorrect_source(cop, ['def foo',
+                                            '  bar(<<EOM',
+                                            '  baz',
+                                            'EOM',
+                                            '     )',
+                                            'end'])
+      expect(new_source).to eq("def foo\n  bar(<<EOM)\n  baz\nEOM\nend")
+    end
   end
 end