rubocop-performance 1.15.0 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb06524c4619412cdce77d2330bc1bfb949a23d6075f5e1b104e8e87bad27e6
-  data.tar.gz: 5908667c00fd6e7e6c133bff94cdad711ce4ea69b85efac2e0b484dc15b75390
+  metadata.gz: ab8b6af1dd52db3d8f00efc6428d397474a9c06b9d950b2aa7afa29b2d7feb8e
+  data.tar.gz: 80102c530b212f682d6e48d1eff740446821a37757b2a94726669f41fd6a6978
 SHA512:
-  metadata.gz: 59b793af217d90b8fea3ffe50634e77ca5970f7729d6b931d83025015385c016c4469a354c85f624b4ef4f52e66559ae38ff9714fd0025106ddf25766e54c3a8
-  data.tar.gz: 295ed43e20bc9d07de773420eb9d44329c000e444d47a6b379d503eb1cf42f6ebfa174c105cb5e80a4deebf5d1aca037475a71dc8569a3528a9932c6d25da1c7
+  metadata.gz: 36f622e84aec25aae177cbfee56b9c530c6843cbc547e960947d21ab46cc8df87774aa717b3daa75a41a823ef7c8836c7b6acd0c0f45415fc4b216a6901ef617
+  data.tar.gz: c46677e2f07fbd77f24690218b377b308299a8558c664cf21e75009a011638da6aaece36e89ba2c2b42b003ba310233d20bcac6fed5d1ae7d1f5d3f48ada47e0

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/cop/performance/redundant_string_chars.rb

@@ -9,6 +9,7 @@ module RuboCop
       #   # bad
       #   str.chars[0..2]
       #   str.chars.slice(0..2)
+      #   str.chars.last
       #
       #   # good
       #   str[0..2].chars
@@ -20,6 +21,7 @@ module RuboCop
       #   # good
       #   str[0]
       #   str[0...2].chars
+      #   str[-1]
       #
       #   # bad
       #   str.chars.take(2)
@@ -33,9 +35,8 @@ module RuboCop
       #   str.size
       #   str.empty?
       #
-      #   # For example, if the receiver is a blank string, it will be incompatible.
+      #   # For example, if the receiver is an empty string, it will be incompatible.
       #   # If a negative value is specified for the receiver, `nil` is returned.
-      #   str.chars.last    # Incompatible with `str[-1]`.
       #   str.chars.last(2) # Incompatible with `str[-2..-1].chars`.
       #   str.chars.drop(2) # Incompatible with `str[2..-1].chars`.
       #
@@ -44,7 +45,7 @@ module RuboCop
         extend AutoCorrector
 
         MSG = 'Use `%<good_method>s` instead of `%<bad_method>s`.'
-        RESTRICT_ON_SEND = %i[[] slice first take length size empty?].freeze
+        RESTRICT_ON_SEND = %i[[] slice first last take length size empty?].freeze
 
         def_node_matcher :redundant_chars_call?, <<~PATTERN
           (send $(send _ :chars) $_ $...)
@@ -52,6 +53,7 @@ module RuboCop
 
         def on_send(node)
           return unless (receiver, method, args = redundant_chars_call?(node))
+          return if method == :last && !args.empty?
 
           range = offense_range(receiver, node)
           message = build_message(method, args)
@@ -86,6 +88,8 @@ module RuboCop
             "[#{build_call_args(args)}].chars"
           when :[], :first
             build_good_method_for_brackets_or_first_method(method, args)
+          when :last
+            '[-1]'
           when :take
             "[0...#{args.first.source}].chars"
           else

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

@@ -124,8 +124,8 @@ module RuboCop
 
         def_node_search :last_matches, <<~PATTERN
           {
-            (send (const nil? :Regexp) :last_match)
-            (send (const nil? :Regexp) :last_match _)
+            (send (const {nil? cbase} :Regexp) :last_match)
+            (send (const {nil? cbase} :Regexp) :last_match _)
             ({back_ref nth_ref} _)
             (gvar #match_gvar?)
           }

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

@@ -22,11 +22,11 @@ module RuboCop
       class StringInclude < Base
         extend AutoCorrector
 
-        MSG = 'Use `String#include?` instead of a regex match with literal-only pattern.'
-        RESTRICT_ON_SEND = %i[match =~ match?].freeze
+        MSG = 'Use `%<negation>sString#include?` instead of a regex match with literal-only pattern.'
+        RESTRICT_ON_SEND = %i[match =~ !~ match?].freeze
 
         def_node_matcher :redundant_regex?, <<~PATTERN
-          {(send $!nil? {:match :=~ :match?} (regexp (str $#literal?) (regopt)))
+          {(send $!nil? {:match :=~ :!~ :match?} (regexp (str $#literal?) (regopt)))
            (send (regexp (str $#literal?) (regopt)) {:match :match?} $str)
            (match-with-lvasgn (regexp (str $#literal?) (regopt)) $_)}
         PATTERN
@@ -34,11 +34,14 @@ module RuboCop
         def on_send(node)
           return unless (receiver, regex_str = redundant_regex?(node))
 
-          add_offense(node) do |corrector|
+          negation = node.send_type? && node.method?(:!~)
+          message = format(MSG, negation: ('!' if negation))
+
+          add_offense(node, message: message) do |corrector|
             receiver, regex_str = regex_str, receiver if receiver.is_a?(String)
             regex_str = interpret_string_escapes(regex_str)
 
-            new_source = "#{receiver.source}.include?(#{to_string_literal(regex_str)})"
+            new_source = "#{'!' if negation}#{receiver.source}.include?(#{to_string_literal(regex_str)})"
 
             corrector.replace(node.source_range, new_source)
           end

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

@@ -70,6 +70,9 @@ module RuboCop
       class Sum < Base
         include RangeHelp
         extend AutoCorrector
+        extend TargetRubyVersion
+
+        minimum_target_ruby_version 2.4
 
         MSG = 'Use `%<good_method>s` instead of `%<bad_method>s`.'
         MSG_IF_NO_INIT_VALUE =

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.2'
 
       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.2
 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-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Automatic performance checking tool for Ruby code.