Add special handling on negating begin node

rubocop · Oct 5, 2022 · 65e43ed · 65e43ed
1 parent 81cd676
commit 65e43ed
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/lib/rubocop/cop/performance/count.rb b/lib/rubocop/cop/performance/count.rb
@@ -116,7 +116,13 @@ def negate_block_pass_reject(corrector, node)
         end
 
         def negate_block_reject(corrector, node)
-          corrector.replace(node.receiver.body, negate_expression(node.receiver.body))
+          target =
+            if node.receiver.body.begin_type?
+              node.receiver.body.children.last
+            else
+              node.receiver.body
+            end
+          corrector.replace(target, negate_expression(target))
         end
 
         def negate_expression(node)

diff --git a/spec/rubocop/cop/performance/count_spec.rb b/spec/rubocop/cop/performance/count_spec.rb
@@ -306,8 +306,35 @@ def count(&block)
 
       expect_correction(<<~RUBY)
         array.count {
-          !(foo
-          bar)
+          foo
+          !(bar)
+        }
+      RUBY
+    end
+  end
+
+  context 'with `reject` with some conditional statement and `length`' do
+    it 'registers an offense' do
+      expect_offense(<<~RUBY)
+        array.reject {
+              ^^^^^^^^ Use `count` instead of `reject...length`.
+          foo
+          if bar
+            baz
+          else
+            qux
+          end
+        }.length
+      RUBY
+
+      expect_correction(<<~RUBY)
+        array.count {
+          foo
+          !(if bar
+            baz
+          else
+            qux
+          end)
         }
       RUBY
     end