rubocop-performance 1.10.2 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 739dfb0dfbef0fa9962b144cb8cb3c600b801a86adc11877898a8eba957a2f39
-  data.tar.gz: 0c5f89ad71bbe81a9c9e42c418401039c9dc0f2ede40fd54c3ba1bc4955011f9
+  metadata.gz: 9f8e6344d490eed1972435e9ce89e171634bff029196b42987d02ee02745ddce
+  data.tar.gz: 863428f02b2e9e387f40bc534775928035ca945d08cfdb8b6602b2765e67f074
 SHA512:
-  metadata.gz: 07cb8c4fc7d80cac74841d9c8bdde26397c4e4273d2ef80b805388020c17cf6820c497a8ea4bfc4a39ca93f538fc2b642399e9fdb1acc401e2e0dad1bf5596d8
-  data.tar.gz: 74696267b3ad0b9ab49aeacfab1de661ab22140a5cea173caa82ddd206159dadc214b996812a5521d1f912c44dfa84cca822d5159c2d8b45426fe1aa55d00896
+  metadata.gz: fb7b9ea8f9626ea64dd44af1c3f6cc2e6141fdf6dc50b4f7aca09c88c11fe68b54a808cfaa2b0bed3a429f4614e85f84a724f833d5c767d7dc9fdc1f1a082014
+  data.tar.gz: a2b8d58a302ea4070e1ce702263806ca1fe3b9d7e3c9944156299c28d8df9ad311d321d202b4cdf02723dc6a331b6817604afea9d7e684e2c9a3cf4300763460

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/rubocop-performance.svg)](https://badge.fury.io/rb/rubocop-performance)
 [![CircleCI](https://circleci.com/gh/rubocop/rubocop-performance.svg?style=svg)](https://circleci.com/gh/rubocop/rubocop-performance)
+[![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?sanitize=true)](https://discord.gg/wJjWvGRDmm)
 
 Performance optimization analysis for your projects, as an extension to [RuboCop](https://github.com/rubocop/rubocop).
 

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: >-
@@ -174,6 +178,12 @@ Performance/IoReadlines:
   Enabled: false
   VersionAdded: '1.7'
 
+Performance/MapCompact:
+  Description: 'Use `filter_map` instead of `collection.map(&:do_something).compact`.'
+  Enabled: pending
+  SafeAutoCorrect: false
+  VersionAdded: '1.11'
+
 Performance/MethodObjectAsBlock:
   Description: 'Use block explicitly instead of block-passing a method object.'
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#normal-way-to-apply-method-vs-method-code'
@@ -220,7 +230,9 @@ Performance/RedundantMerge:
   Description: 'Use Hash#[]=, rather than Hash#merge! with a single key-value pair.'
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#hashmerge-vs-hash-code'
   Enabled: true
+  Safe: false
   VersionAdded: '0.36'
+  VersionChanged: '1.11'
   # Max number of key-value pairs to consider an offense
   MaxKeyValuePairs: 2
 
@@ -258,6 +270,11 @@ Performance/ReverseFirst:
   Enabled: 'pending'
   VersionAdded: '1.7'
 
+Performance/SelectMap:
+  Description: 'Use `filter_map` instead of `ary.select(&:foo).map(&:bar)`.'
+  Enabled: false
+  VersionAdded: '1.11'
+
 Performance/Size:
   Description: >-
                   Use `size` instead of `count` for counting

data/config/obsoletion.yml

@@ -0,0 +1,7 @@
+#
+# Configuration for obsoletion.
+#
+# See: https://docs.rubocop.org/rubocop/extensions.html#config-obsoletions
+#
+extracted:
+  Performance/*: ~

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/chain_array_allocation.rb

@@ -63,6 +63,8 @@ module RuboCop
 
         def on_send(node)
           chain_array_allocation?(node) do |fm, sm|
+            return if node.each_descendant(:send).any? { |descendant| descendant.method?(:lazy) }
+
             range = range_between(node.loc.dot.begin_pos, node.source_range.end_pos)
 
             add_offense(range, message: format(MSG, method: fm, second_method: sm))

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/flat_map.rb

@@ -3,7 +3,8 @@
 module RuboCop
   module Cop
     module Performance
-      # This cop is used to identify usages of
+      # This cop is used to identify usages of `map { ... }.flatten` and
+      # change them to use `flat_map { ... }` instead.
       #
       # @example
       #   # bad

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Performance
+      # In Ruby 2.7, `Enumerable#filter_map` has been added.
+      #
+      # This cop identifies places where `map { ... }.compact` can be replaced by `filter_map`.
+      # It is marked as unsafe auto-correction by default because `map { ... }.compact`
+      # that is not compatible with `filter_map`.
+      #
+      # [source,ruby]
+      # ----
+      # [true, false, nil].compact              #=> [true, false]
+      # [true, false, nil].filter_map(&:itself) #=> [true]
+      # ----
+      #
+      # @example
+      #   # bad
+      #   ary.map(&:foo).compact
+      #   ary.collect(&:foo).compact
+      #
+      #   # good
+      #   ary.filter_map(&:foo)
+      #   ary.map(&:foo).compact!
+      #   ary.compact.map(&:foo)
+      #
+      class MapCompact < Base
+        include RangeHelp
+        extend AutoCorrector
+        extend TargetRubyVersion
+
+        MSG = 'Use `filter_map` instead.'
+        RESTRICT_ON_SEND = %i[compact].freeze
+
+        minimum_target_ruby_version 2.7
+
+        def_node_matcher :map_compact, <<~PATTERN
+          {
+            (send
+              $(send _ {:map :collect}
+                (block_pass
+                  (sym _))) _)
+            (send
+              (block
+                $(send _ {:map :collect})
+                  (args ...) _) _)
+          }
+        PATTERN
+
+        def on_send(node)
+          return unless (map_node = map_compact(node))
+
+          compact_loc = node.loc
+          range = range_between(map_node.loc.selector.begin_pos, compact_loc.selector.end_pos)
+
+          add_offense(range) do |corrector|
+            corrector.replace(map_node.loc.selector, 'filter_map')
+            remove_compact_method(corrector, node)
+          end
+        end
+
+        private
+
+        def remove_compact_method(corrector, compact_node)
+          chained_method = compact_node.parent
+          compact_method_range = compact_node.loc.selector
+
+          if compact_node.multiline? && chained_method&.loc.respond_to?(:selector) &&
+             !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
+            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
+  end
+end

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

@@ -8,6 +8,9 @@ module RuboCop
       # You can set the maximum number of key-value pairs to consider
       # an offense with `MaxKeyValuePairs`.
       #
+      # This cop is marked as unsafe because RuboCop cannot determine if the
+      # receiver of `merge!` is actually a hash or not.
+      #
       # @example
       #   # bad
       #   hash.merge!(a: 1)

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/select_map.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Performance
+      # In Ruby 2.7, `Enumerable#filter_map` has been added.
+      #
+      # This cop identifies places where `select.map` can be replaced by `filter_map`.
+      #
+      # @example
+      #   # bad
+      #   ary.select(&:foo).map(&:bar)
+      #   ary.filter(&:foo).map(&:bar)
+      #
+      #   # good
+      #   ary.filter_map { |o| o.bar if o.foo }
+      #
+      class SelectMap < Base
+        include RangeHelp
+        extend TargetRubyVersion
+
+        minimum_target_ruby_version 2.7
+
+        MSG = 'Use `filter_map` instead of `%<method_name>s.map`.'
+        RESTRICT_ON_SEND = %i[select filter].freeze
+
+        def_node_matcher :bad_method?, <<~PATTERN
+          (send nil? :bad_method ...)
+        PATTERN
+
+        def on_send(node)
+          return if (first_argument = node.first_argument) && !first_argument.block_pass_type?
+          return unless (send_node = map_method_candidate(node))
+          return unless send_node.method?(:map)
+
+          map_method = send_node.parent&.block_type? ? send_node.parent : send_node
+
+          range = offense_range(node, map_method)
+          add_offense(range, message: format(MSG, method_name: node.method_name))
+        end
+
+        private
+
+        def map_method_candidate(node)
+          return unless (parent = node.parent)
+
+          if parent.block_type? && parent.parent&.send_type?
+            parent.parent
+          elsif parent.send_type?
+            parent
+          end
+        end
+
+        def offense_range(node, map_method)
+          range_between(node.loc.selector.begin_pos, map_method.loc.expression.end_pos)
+        end
+      end
+    end
+  end
+end

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

@@ -23,6 +23,7 @@ require_relative 'performance/end_with'
 require_relative 'performance/fixed_size'
 require_relative 'performance/flat_map'
 require_relative 'performance/inefficient_hash_search'
+require_relative 'performance/map_compact'
 require_relative 'performance/method_object_as_block'
 require_relative 'performance/open_struct'
 require_relative 'performance/range_include'
@@ -37,6 +38,7 @@ require_relative 'performance/redundant_string_chars'
 require_relative 'performance/regexp_match'
 require_relative 'performance/reverse_each'
 require_relative 'performance/reverse_first'
+require_relative 'performance/select_map'
 require_relative 'performance/size'
 require_relative 'performance/sort_reverse'
 require_relative 'performance/squeeze'

data/lib/rubocop/performance.rb

@@ -8,5 +8,7 @@ module RuboCop
     CONFIG = YAML.safe_load(CONFIG_DEFAULT.read).freeze
 
     private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
+
+    ::RuboCop::ConfigObsoletion.files << PROJECT_ROOT.join('config', 'obsoletion.yml')
   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.10.2'
+      STRING = '1.11.4'
 
       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.10.2
+  version: 1.11.4
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -59,6 +59,7 @@ files:
 - LICENSE.txt
 - README.md
 - config/default.yml
+- config/obsoletion.yml
 - lib/rubocop-performance.rb
 - lib/rubocop/cop/mixin/regexp_metacharacter.rb
 - lib/rubocop/cop/mixin/sort_block.rb
@@ -84,6 +85,7 @@ files:
 - lib/rubocop/cop/performance/flat_map.rb
 - lib/rubocop/cop/performance/inefficient_hash_search.rb
 - lib/rubocop/cop/performance/io_readlines.rb
+- lib/rubocop/cop/performance/map_compact.rb
 - lib/rubocop/cop/performance/method_object_as_block.rb
 - lib/rubocop/cop/performance/open_struct.rb
 - lib/rubocop/cop/performance/range_include.rb
@@ -97,6 +99,7 @@ files:
 - lib/rubocop/cop/performance/regexp_match.rb
 - lib/rubocop/cop/performance/reverse_each.rb
 - lib/rubocop/cop/performance/reverse_first.rb
+- lib/rubocop/cop/performance/select_map.rb
 - lib/rubocop/cop/performance/size.rb
 - lib/rubocop/cop/performance/sort_reverse.rb
 - lib/rubocop/cop/performance/squeeze.rb
@@ -118,7 +121,7 @@ metadata:
   homepage_uri: https://docs.rubocop.org/rubocop-performance/
   changelog_uri: https://github.com/rubocop/rubocop-performance/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop-performance/
-  documentation_uri: https://docs.rubocop.org/rubocop-performance/1.10/
+  documentation_uri: https://docs.rubocop.org/rubocop-performance/1.11/
   bug_tracker_uri: https://github.com/rubocop/rubocop-performance/issues
 post_install_message:
 rdoc_options: []
@@ -128,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="