rubocop-performance 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb06524c4619412cdce77d2330bc1bfb949a23d6075f5e1b104e8e87bad27e6
-  data.tar.gz: 5908667c00fd6e7e6c133bff94cdad711ce4ea69b85efac2e0b484dc15b75390
+  metadata.gz: 116e2f10caf814178e8afe49e7bac931cbb232dfd1ce8bb478057b7e0a0ce056
+  data.tar.gz: 0c9c7d2b6180607cc6988eca34ba7364a8295565ab07ddbeaa0c81027f5d3000
 SHA512:
-  metadata.gz: 59b793af217d90b8fea3ffe50634e77ca5970f7729d6b931d83025015385c016c4469a354c85f624b4ef4f52e66559ae38ff9714fd0025106ddf25766e54c3a8
-  data.tar.gz: 295ed43e20bc9d07de773420eb9d44329c000e444d47a6b379d503eb1cf42f6ebfa174c105cb5e80a4deebf5d1aca037475a71dc8569a3528a9932c6d25da1c7
+  metadata.gz: fd9c4b591e4193d5ef640a586c71b7cb0b27dbde63022128119297ebfc9e09741f5a26ee8ef2c1cea876c4f919f48b8fbd364285149c45b89818c6e0ecf1a3c6
+  data.tar.gz: 8984a58f416a279e7a6f74f4917600a9ba97a90fca81160b0899a66123612736576c870668e8b5e52bb5de0aae5c34ea5874105fa58f3aef63987d5cea319198

data/lib/rubocop/cop/performance/count.rb

@@ -79,12 +79,11 @@ module RuboCop
         def autocorrect(corrector, node, selector_node, selector)
           selector_loc = selector_node.loc.selector
 
-          return if selector == :reject
-
           range = source_starting_at(node) { |n| n.loc.dot.begin_pos }
 
           corrector.remove(range)
           corrector.replace(selector_loc, 'count')
+          negate_reject(corrector, node) if selector == :reject
         end
 
         def eligible_node?(node)
@@ -100,6 +99,43 @@ module RuboCop
 
           range_between(begin_pos, node.source_range.end_pos)
         end
+
+        def negate_reject(corrector, node)
+          if node.receiver.send_type?
+            negate_block_pass_reject(corrector, node)
+          else
+            negate_block_reject(corrector, node)
+          end
+        end
+
+        def negate_block_pass_reject(corrector, node)
+          corrector.replace(
+            node.receiver.loc.expression.with(begin_pos: node.receiver.loc.begin.begin_pos),
+            negate_block_pass_as_inline_block(node.receiver)
+          )
+        end
+
+        def negate_block_reject(corrector, node)
+          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)
+          "!(#{node.source})"
+        end
+
+        def negate_block_pass_as_inline_block(node)
+          if node.last_argument.children.first.sym_type?
+            " { |element| !element.#{node.last_argument.children.first.value} }"
+          else
+            " { !#{node.last_argument.children.first.source}.call }"
+          end
+        end
       end
     end
   end

data/lib/rubocop/cop/performance/map_compact.rb

@@ -67,7 +67,7 @@ module RuboCop
         def remove_compact_method(corrector, map_node, compact_node, chained_method)
           compact_method_range = compact_node.loc.selector
 
-          if compact_node.multiline? && chained_method&.loc.respond_to?(:selector) && chained_method.dot? &&
+          if compact_node.multiline? && chained_method&.loc.respond_to?(:selector) && use_dot?(chained_method) &&
              !map_method_and_compact_method_on_same_line?(map_node, compact_node) &&
              !invoke_method_after_map_compact_on_same_line?(compact_node, chained_method)
             compact_method_range = compact_method_with_final_newline_range(compact_method_range)
@@ -78,6 +78,10 @@ module RuboCop
           corrector.remove(compact_method_range)
         end
 
+        def use_dot?(node)
+          node.respond_to?(:dot?) && node.dot?
+        end
+
         def map_method_and_compact_method_on_same_line?(map_node, compact_node)
           compact_node.loc.selector.line == map_node.loc.selector.line
         end

data/lib/rubocop/performance/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Performance
     # This module holds the RuboCop Performance version information.
     module Version
-      STRING = '1.15.0'
+      STRING = '1.15.1'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-performance
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-10 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop