rubocop-performance 1.11.1 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fddb9566bda412ba7ab8f26966cca63207064468d2c2da5796a81cd84da1c69
-  data.tar.gz: f49da21e50225a0f35fe6959ad3a37a2c26ff73e64df03f5a94025811d380b02
+  metadata.gz: 4fffd38c1ed7da6f4ff4f67b3f1d7d08bc60e8871dc22d4ac266de6facc04fcf
+  data.tar.gz: e0de1a9ec946e37b2654390d4b46a0b9f0e1afbc37fec464c6fd78001ad5e509
 SHA512:
-  metadata.gz: a70fd0b8cf0778f410098e889dc52c828202f0d197a10a9fb4edff36991204cad23cfba361039b9b80952c7f5f814679d7277e2f9c533fe29fd55e708c4d1bb9
-  data.tar.gz: a2ce3b7915ed3c3bc208ef020f031646e3350d46397759eb0c5a772e826dc30ad8d72d75c009b385358ef015be4b6af4c7cd1b6f337b6f34c583432bef608a65
+  metadata.gz: 4225a879e2e0421438be5d17bb38d982901709c809ed7ccda3a0095affaf77a707c5fb5657ee61b123546860f1e9f0bcf783ed706b8b17fba9114588a16b4653
+  data.tar.gz: 3af998bbda7046ae5a55f06bb1ecc941dff48901d94a791fd81963cc1d76adf39524600c7ff4633c3dc06f925a2d8ea7f57716f51de2079e971c10b6194e40bb

data/config/default.yml

@@ -96,14 +96,18 @@ Performance/Count:
 Performance/DeletePrefix:
   Description: 'Use `delete_prefix` instead of `gsub`.'
   Enabled: true
+  Safe: false
   SafeMultiline: true
   VersionAdded: '1.6'
+  VersionChanged: '1.11'
 
 Performance/DeleteSuffix:
   Description: 'Use `delete_suffix` instead of `gsub`.'
   Enabled: true
+  Safe: false
   SafeMultiline: true
   VersionAdded: '1.6'
+  VersionChanged: '1.11'
 
 Performance/Detect:
   Description: >-

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

@@ -11,11 +11,11 @@ module RuboCop
       #
       # @example
       #   # bad
-      #   # array[..2]
-      #   # array[...2]
-      #   # array[2..]
-      #   # array[2...]
-      #   # array.slice(..2)
+      #   array[..2]
+      #   array[...2]
+      #   array[2..]
+      #   array[2...]
+      #   array.slice(..2)
       #
       #   # good
       #   array.take(3)

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

@@ -58,10 +58,8 @@ module RuboCop
         include RangeHelp
         extend AutoCorrector
 
-        MSG = 'Reordering `when` conditions with a splat to the end ' \
-          'of the `when` branches can improve performance.'
-        ARRAY_MSG = 'Pass the contents of array literals ' \
-          'directly to `when` conditions.'
+        MSG = 'Reordering `when` conditions with a splat to the end of the `when` branches can improve performance.'
+        ARRAY_MSG = 'Pass the contents of array literals directly to `when` conditions.'
 
         def on_case(case_node)
           when_conditions = case_node.when_branches.flat_map(&:conditions)
@@ -134,13 +132,11 @@ module RuboCop
         end
 
         def new_condition_with_then(node, new_condition)
-          "\n#{indent_for(node)}when " \
-          "#{new_condition} then #{node.body.source}"
+          "\n#{indent_for(node)}when #{new_condition} then #{node.body.source}"
         end
 
         def new_branch_without_then(node, new_condition)
-          "\n#{indent_for(node)}when #{new_condition}" \
-          "\n#{indent_for(node.body)}#{node.body.source}"
+          "\n#{indent_for(node)}when #{new_condition}\n#{indent_for(node.body)}#{node.body.source}"
         end
 
         def indent_for(node)

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

@@ -33,7 +33,7 @@ module RuboCop
       #
       class CollectionLiteralInLoop < Base
         MSG = 'Avoid immutable %<literal_class>s literals in loops. '\
-          'It is better to extract it into a local variable or a constant.'
+              'It is better to extract it into a local variable or a constant.'
 
         POST_CONDITION_LOOP_TYPES = %i[while_post until_post].freeze
         LOOP_TYPES = (POST_CONDITION_LOOP_TYPES + %i[while until for]).freeze

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

@@ -7,6 +7,7 @@ module RuboCop
       #
       # This cop identifies places where `gsub(/\Aprefix/, '')` and `sub(/\Aprefix/, '')`
       # can be replaced by `delete_prefix('prefix')`.
+      # It is marked as unsafe by default because `Pathname` has `sub` but not `delete_prefix`.
       #
       # This cop has `SafeMultiline` configuration option that `true` by default because
       # `^prefix` is unsafe as it will behave incompatible with `delete_prefix`
@@ -66,7 +67,7 @@ module RuboCop
 
         def on_send(node)
           return unless (receiver, bad_method, regexp_str, replace_string = delete_prefix_candidate?(node))
-          return unless replace_string.blank?
+          return unless replace_string.empty?
 
           good_method = PREFERRED_METHODS[bad_method]
 

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

@@ -7,6 +7,7 @@ module RuboCop
       #
       # This cop identifies places where `gsub(/suffix\z/, '')` and `sub(/suffix\z/, '')`
       # can be replaced by `delete_suffix('suffix')`.
+      # It is marked as unsafe by default because `Pathname` has `sub` but not `delete_suffix`.
       #
       # This cop has `SafeMultiline` configuration option that `true` by default because
       # `suffix$` is unsafe as it will behave incompatible with `delete_suffix?`
@@ -66,7 +67,7 @@ module RuboCop
 
         def on_send(node)
           return unless (receiver, bad_method, regexp_str, replace_string = delete_suffix_candidate?(node))
-          return unless replace_string.blank?
+          return unless replace_string.empty?
 
           good_method = PREFERRED_METHODS[bad_method]
 

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

@@ -31,14 +31,10 @@ module RuboCop
 
         CANDIDATE_METHODS = Set[:select, :find_all, :filter].freeze
 
-        MSG = 'Use `%<prefer>s` instead of ' \
-              '`%<first_method>s.%<second_method>s`.'
-        REVERSE_MSG = 'Use `reverse.%<prefer>s` instead of ' \
-                      '`%<first_method>s.%<second_method>s`.'
-        INDEX_MSG = 'Use `%<prefer>s` instead of ' \
-              '`%<first_method>s[%<index>i]`.'
-        INDEX_REVERSE_MSG = 'Use `reverse.%<prefer>s` instead of ' \
-              '`%<first_method>s[%<index>i]`.'
+        MSG = 'Use `%<prefer>s` instead of `%<first_method>s.%<second_method>s`.'
+        REVERSE_MSG = 'Use `reverse.%<prefer>s` instead of `%<first_method>s.%<second_method>s`.'
+        INDEX_MSG = 'Use `%<prefer>s` instead of `%<first_method>s[%<index>i]`.'
+        INDEX_REVERSE_MSG = 'Use `reverse.%<prefer>s` instead of `%<first_method>s[%<index>i]`.'
         RESTRICT_ON_SEND = %i[first last []].freeze
 
         def_node_matcher :detect_candidate?, <<~PATTERN

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

@@ -23,6 +23,7 @@ module RuboCop
       #   # good
       #   ary.filter_map(&:foo)
       #   ary.map(&:foo).compact!
+      #   ary.compact.map(&:foo)
       #
       class MapCompact < Base
         include RangeHelp
@@ -55,21 +56,28 @@ module RuboCop
 
           add_offense(range) do |corrector|
             corrector.replace(map_node.loc.selector, 'filter_map')
-            corrector.remove(compact_loc.dot)
-            corrector.remove(compact_method_range(node))
+            remove_compact_method(corrector, node)
           end
         end
 
         private
 
-        def compact_method_range(compact_node)
+        def remove_compact_method(corrector, compact_node)
+          chained_method = compact_node.parent
           compact_method_range = compact_node.loc.selector
 
-          if compact_node.multiline?
-            range_by_whole_lines(compact_method_range, include_final_newline: true)
+          if compact_node.multiline? && chained_method&.loc.respond_to?(:selector) && chained_method.dot? &&
+             !invoke_method_after_map_compact_on_same_line?(compact_node, chained_method)
+            compact_method_range = range_by_whole_lines(compact_method_range, include_final_newline: true)
           else
-            compact_method_range
+            corrector.remove(compact_node.loc.dot)
           end
+
+          corrector.remove(compact_method_range)
+        end
+
+        def invoke_method_after_map_compact_on_same_line?(compact_node, chained_method)
+          compact_node.loc.selector.line == chained_method.loc.selector.line
         end
       end
     end

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

@@ -74,12 +74,27 @@ module RuboCop
 
         def new_argument(block_argument, block_body)
           if block_argument.source == block_body.receiver.source
-            block_body.first_argument.source
+            rhs = block_body.first_argument
+            return if use_block_argument_in_method_argument_of_operand?(block_argument, rhs)
+
+            rhs.source
           elsif block_argument.source == block_body.first_argument.source
-            block_body.receiver.source
+            lhs = block_body.receiver
+            return if use_block_argument_in_method_argument_of_operand?(block_argument, lhs)
+
+            lhs.source
           end
         end
 
+        def use_block_argument_in_method_argument_of_operand?(block_argument, operand)
+          return false unless operand.send_type?
+
+          arguments = operand.arguments
+          arguments.inject(arguments.map(&:source)) do |operand_sources, argument|
+            operand_sources + argument.each_descendant(:lvar).map(&:source)
+          end.any?(block_argument.source)
+        end
+
         def offense_range(node)
           node.send_node.loc.selector.join(node.source_range.end)
         end

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

@@ -16,35 +16,35 @@ module RuboCop
       #   # bad
       #   str.chars.first
       #   str.chars.first(2)
-      #   str.chars.last
-      #   str.chars.last(2)
       #
       #   # good
       #   str[0]
       #   str[0...2].chars
-      #   str[-1]
-      #   str[-2..-1].chars
       #
       #   # bad
       #   str.chars.take(2)
-      #   str.chars.drop(2)
       #   str.chars.length
       #   str.chars.size
       #   str.chars.empty?
       #
       #   # good
       #   str[0...2].chars
-      #   str[2..-1].chars
       #   str.length
       #   str.size
       #   str.empty?
       #
+      #   # For example, if the receiver is a blank 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`.
+      #
       class RedundantStringChars < Base
         include RangeHelp
         extend AutoCorrector
 
         MSG = 'Use `%<good_method>s` instead of `%<bad_method>s`.'
-        RESTRICT_ON_SEND = %i[[] slice first last take drop length size empty?].freeze
+        RESTRICT_ON_SEND = %i[[] slice first take length size empty?].freeze
 
         def_node_matcher :redundant_chars_call?, <<~PATTERN
           (send $(send _ :chars) $_ $...)
@@ -80,7 +80,6 @@ module RuboCop
           format(MSG, good_method: good_method, bad_method: bad_method)
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
         def build_good_method(method, args)
           case method
           when :[], :slice
@@ -91,21 +90,12 @@ module RuboCop
             else
               '[0]'
             end
-          when :last
-            if args.any?
-              "[-#{args.first.source}..-1].chars"
-            else
-              '[-1]'
-            end
           when :take
             "[0...#{args.first.source}].chars"
-          when :drop
-            "[#{args.first.source}..-1].chars"
           else
             ".#{method}"
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
 
         def build_bad_method(method, args)
           case method

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

@@ -78,8 +78,7 @@ module RuboCop
         # Constants are included in this list because it is unlikely that
         # someone will store `nil` as a constant and then use it for comparison
         TYPES_IMPLEMENTING_MATCH = %i[const regexp str sym].freeze
-        MSG = 'Use `match?` instead of `%<current>s` when `MatchData` ' \
-          'is not used.'
+        MSG = 'Use `match?` instead of `%<current>s` when `MatchData` is not used.'
 
         def_node_matcher :match_method?, <<~PATTERN
           {

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

@@ -45,7 +45,10 @@ module RuboCop
           return unless dup_string?(node) || string_new?(node)
 
           add_offense(node) do |corrector|
-            corrector.replace(node, "+#{string_value(node)}")
+            string_value = "+#{string_value(node)}"
+            string_value = "(#{string_value})" if node.parent&.send_type?
+
+            corrector.replace(node, string_value)
           end
         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.11.1'
+      STRING = '1.11.5'
 
       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.11.1
+  version: 1.11.5
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop