rubocop-performance 1.10.0 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c936c552e05f2364a4256d5f0975973ee3a332270bc1af524db3420e9fc70ba5
-  data.tar.gz: 3cd0086460c2db1c5926caef0737a1d9ae4038808b58b7c91f97e349cfe8f1b6
+  metadata.gz: a26b6360b5df05f3a7a8dfe957e5ecad0922105024a2e49dae8c39a566f10d88
+  data.tar.gz: 7591fd4d805f4d6dad68b83c8fbffff8e563bfa27bd58030efa48f332c392b2f
 SHA512:
-  metadata.gz: cdc03f8c28e3ea1f63a8477fe064cf1df766f6334fc017d5f8bc7a830f189ad11c1f5a65a33008469b4fe8438522f64b56e6b026fdadb208abf18181d2a6d261
-  data.tar.gz: 04034d2353dc721670ac494d40fae7383ba3800923feea6140c8ea9d86ee080028bc8fb05e46deeb475f1365705114d6a3848520e01248076f38f6e4ef18282f
+  metadata.gz: c8fb234710212fd000d0d695da71a1b1a36687550cf3738ce987264dad85f015d2f1f1da9b0f511c2147532ff7d6d444b35efb472b399646171bbb35e0ff79ad
+  data.tar.gz: 8447f79bb69e546ff684ece819b626fbfc68db8f7154b1b839c22167c87dbbf58821f1abe626a2b6d486ccfc81601e0844e416a312703ce0be7bc5552f1160ab

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

@@ -174,6 +174,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 +226,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 +266,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/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/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,83 @@
+# 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!
+      #
+      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')
+            corrector.remove(compact_loc.dot)
+            corrector.remove(compact_method_range(node))
+          end
+        end
+
+        private
+
+        def compact_method_range(compact_node)
+          chained_method = compact_node.parent
+          compact_method_range = compact_node.loc.selector
+
+          if compact_node.multiline? &&
+             chained_method && !invoke_method_after_map_compact_on_same_line?(compact_node, chained_method)
+            range_by_whole_lines(compact_method_range, include_final_newline: true)
+          else
+            compact_method_range
+          end
+        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_block_call.rb

@@ -78,7 +78,7 @@ module RuboCop
         end
 
         def calls_to_report(argname, body)
-          return [] if blockarg_assigned?(body, argname)
+          return [] if blockarg_assigned?(body, argname) || shadowed_block_argument?(body, argname)
 
           blockarg_calls(body, argname).map do |call|
             return [] if args_include_block_pass?(call)
@@ -87,6 +87,12 @@ module RuboCop
           end
         end
 
+        def shadowed_block_argument?(body, block_argument_of_method_signature)
+          return false unless body.block_type?
+
+          body.arguments.map(&:source).include?(block_argument_of_method_signature.to_s)
+        end
+
         def args_include_block_pass?(blockcall)
           _receiver, _call, *args = *blockcall
 

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

@@ -32,13 +32,16 @@ module RuboCop
 
         TARGET_METHODS = %i[all? any? one? none?].freeze
         COMPARISON_METHODS = %i[== === is_a? kind_of?].freeze
+        IS_A_METHODS = %i[is_a? kind_of?].freeze
 
         def on_block(node)
           return unless TARGET_METHODS.include?(node.method_name)
+          return unless one_block_argument?(node.arguments)
 
           block_argument = node.arguments.first
           block_body = node.body
           return unless use_equality_comparison_block?(block_body)
+          return if same_block_argument_and_is_a_argument?(block_body, block_argument)
           return unless (new_argument = new_argument(block_argument, block_body))
 
           range = offense_range(node)
@@ -51,10 +54,24 @@ module RuboCop
 
         private
 
+        def one_block_argument?(block_arguments)
+          block_arguments.one? && !block_arguments.source.include?(',')
+        end
+
         def use_equality_comparison_block?(block_body)
           block_body.send_type? && COMPARISON_METHODS.include?(block_body.method_name)
         end
 
+        def same_block_argument_and_is_a_argument?(block_body, block_argument)
+          if block_body.method?(:===)
+            block_argument.source != block_body.children[2].source
+          elsif IS_A_METHODS.include?(block_body.method_name)
+            block_argument.source == block_body.first_argument.source
+          else
+            false
+          end
+        end
+
         def new_argument(block_argument, block_body)
           if block_argument.source == block_body.receiver.source
             block_body.first_argument.source

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_split_regexp_argument.rb

@@ -21,32 +21,29 @@ module RuboCop
         STR_SPECIAL_CHARS = %w[\n \" \' \\\\ \t \b \f \r].freeze
 
         def_node_matcher :split_call_with_regexp?, <<~PATTERN
-          {(send !nil? :split {regexp})}
+          {(send !nil? :split $regexp)}
         PATTERN
 
         def on_send(node)
-          return unless split_call_with_regexp?(node)
-          return unless determinist_regexp?(node.first_argument)
+          return unless (regexp_node = split_call_with_regexp?(node))
+          return if regexp_node.ignore_case? || regexp_node.content == ' '
+          return unless determinist_regexp?(regexp_node)
 
-          add_offense(node.first_argument) do |corrector|
-            autocorrect(corrector, node)
+          add_offense(regexp_node) do |corrector|
+            new_argument = replacement(regexp_node)
+
+            corrector.replace(regexp_node, "\"#{new_argument}\"")
           end
         end
 
         private
 
-        def determinist_regexp?(first_argument)
-          DETERMINISTIC_REGEX.match?(first_argument.source)
-        end
-
-        def autocorrect(corrector, node)
-          new_argument = replacement(node)
-
-          corrector.replace(node.first_argument, "\"#{new_argument}\"")
+        def determinist_regexp?(regexp_node)
+          DETERMINISTIC_REGEX.match?(regexp_node.source)
         end
 
-        def replacement(node)
-          regexp_content = node.first_argument.content
+        def replacement(regexp_node)
+          regexp_content = regexp_node.content
           stack = []
           chars = regexp_content.chars.each_with_object([]) do |char, strings|
             if stack.empty? && char == '\\'

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

@@ -6,12 +6,20 @@ module RuboCop
       # This cop is used to identify usages of `reverse.each` and
       # change them to use `reverse_each` instead.
       #
+      # If the return value is used, it will not be detected because the result will be different.
+      #
+      # [source,ruby]
+      # ----
+      # [1, 2, 3].reverse.each {} #=> [3, 2, 1]
+      # [1, 2, 3].reverse_each {} #=> [1, 2, 3]
+      # ----
+      #
       # @example
       #   # bad
-      #   [].reverse.each
+      #   items.reverse.each
       #
       #   # good
-      #   [].reverse_each
+      #   items.reverse_each
       class ReverseEach < Base
         include RangeHelp
         extend AutoCorrector
@@ -24,6 +32,8 @@ module RuboCop
         MATCHER
 
         def on_send(node)
+          return if use_return_value?(node)
+
           reverse_each?(node) do
             range = offense_range(node)
 
@@ -35,6 +45,12 @@ module RuboCop
 
         private
 
+        def use_return_value?(node)
+          !!node.ancestors.detect do |ancestor|
+            ancestor.assignment? || ancestor.send_type? || ancestor.return_type?
+          end
+        end
+
         def offense_range(node)
           range_between(node.children.first.loc.selector.begin_pos, node.loc.selector.end_pos)
         end

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_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.0'
+      STRING = '1.11.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.10.0
+  version: 1.11.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-05-05 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,14 +131,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.9
+rubygems_version: 3.2.12
 signing_key:
 specification_version: 4
 summary: Automatic performance checking tool for Ruby code.