Merge pull request #201 from koic/fix_incorrect_autocorrect_for_rever…

…se_each Fix an incorrect auto-correct for `Performance/ReverseEach`
rubocop · Dec 21, 2020 · 56147bc · 56147bc
2 parents 0e59891 + 2ae0e2e
commit 56147bc
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Bug fixes
+
+* [#201](https://github.com/rubocop-hq/rubocop-performance/pull/201): Fix an incorrect auto-correct for `Performance/ReverseEach` when using multi-line `reverse.each` with leading dot. ([@koic][])
+
 ## 1.9.1 (2020-11-28)
 
 ### Bug fixes

diff --git a/lib/rubocop/cop/performance/reverse_each.rb b/lib/rubocop/cop/performance/reverse_each.rb
@@ -18,29 +18,25 @@ class ReverseEach < Base
 
         MSG = 'Use `reverse_each` instead of `reverse.each`.'
         RESTRICT_ON_SEND = %i[each].freeze
-        UNDERSCORE = '_'
 
         def_node_matcher :reverse_each?, <<~MATCHER
-          (send $(send _ :reverse) :each)
+          (send (send _ :reverse) :each)
         MATCHER
 
         def on_send(node)
-          reverse_each?(node) do |receiver|
-            location_of_reverse = receiver.loc.selector.begin_pos
-            end_location = node.loc.selector.end_pos
-
-            range = range_between(location_of_reverse, end_location)
+          reverse_each?(node) do
+            range = offense_range(node)
 
             add_offense(range) do |corrector|
-              corrector.replace(replacement_range(node), UNDERSCORE)
+              corrector.replace(range, 'reverse_each')
             end
           end
         end
 
         private
 
-        def replacement_range(node)
-          range_between(node.loc.dot.begin_pos, node.loc.selector.begin_pos)
+        def offense_range(node)
+          range_between(node.children.first.loc.selector.begin_pos, node.loc.selector.end_pos)
         end
       end
     end

diff --git a/spec/rubocop/cop/performance/reverse_each_spec.rb b/spec/rubocop/cop/performance/reverse_each_spec.rb
@@ -87,18 +87,19 @@ def arr
       RUBY
     end
 
-    it 'corrects a multi-line reverse_each' do
-      new_source = autocorrect_source(<<~RUBY)
+    it 'registers and corrects when using multi-line `reverse.each` with trailing dot' do
+      expect_offense(<<~RUBY)
         def arr
           [1, 2]
         end
 
         arr.
           reverse.
+          ^^^^^^^^ Use `reverse_each` instead of `reverse.each`.
           each { |e| puts e }
       RUBY
 
-      expect(new_source).to eq(<<~RUBY)
+      expect_correction(<<~RUBY)
         def arr
           [1, 2]
         end
@@ -107,5 +108,27 @@ def arr
           reverse_each { |e| puts e }
       RUBY
     end
+
+    it 'registers and corrects when using multi-line `reverse.each` with leading dot' do
+      expect_offense(<<~RUBY)
+        def arr
+          [1, 2]
+        end
+
+        arr
+          .reverse
+           ^^^^^^^ Use `reverse_each` instead of `reverse.each`.
+          .each { |e| puts e }
+      RUBY
+
+      expect_correction(<<~RUBY)
+        def arr
+          [1, 2]
+        end
+
+        arr
+          .reverse_each { |e| puts e }
+      RUBY
+    end
   end
 end