Merge pull request #11879 from Homebrew/dependabot/bundler/Library/Ho…

…mebrew/rubocop-performance-1.11.5 build(deps): bump rubocop-performance from 1.11.4 to 1.11.5 in /Library/Homebrew
Homebrew · Aug 18, 2021 · 8d2811e · 8d2811e
2 parents 7011e0f + 9757b7b
commit 8d2811e
Show file tree

Hide file tree

Showing 59 changed files with 22 additions and 6 deletions.
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
@@ -123,7 +123,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.10.0)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.4)
+    rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.11.3)

diff --git a/...t/rbi/gems/rubocop-performance@1.11.4.rbi → ...t/rbi/gems/rubocop-performance@1.11.5.rbi b/...t/rbi/gems/rubocop-performance@1.11.4.rbi → ...t/rbi/gems/rubocop-performance@1.11.5.rbi
@@ -464,6 +464,7 @@ class RuboCop::Cop::Performance::RedundantEqualityComparisonBlock < ::RuboCop::C
   def offense_range(node); end
   def one_block_argument?(block_arguments); end
   def same_block_argument_and_is_a_argument?(block_body, block_argument); end
+  def use_block_argument_in_method_argument_of_operand?(block_argument, operand); end
   def use_equality_comparison_block?(block_body); end
 end
 

diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -82,7 +82,7 @@
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.11.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-2.0.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-1.19.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.11.4/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-performance-1.11.5/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rails-2.11.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-2.4.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-sorbet-0.6.2/lib"

diff --git a/...cop-performance-1.11.4/config/default.yml → ...cop-performance-1.11.5/config/default.yml b/...cop-performance-1.11.4/config/default.yml → ...cop-performance-1.11.5/config/default.yml
diff --git a/...-performance-1.11.4/config/obsoletion.yml → ...-performance-1.11.5/config/obsoletion.yml b/...-performance-1.11.4/config/obsoletion.yml → ...-performance-1.11.5/config/obsoletion.yml
diff --git a/...ormance-1.11.4/lib/rubocop-performance.rb → ...ormance-1.11.5/lib/rubocop-performance.rb b/...ormance-1.11.4/lib/rubocop-performance.rb → ...ormance-1.11.5/lib/rubocop-performance.rb
diff --git a/...rubocop/cop/mixin/regexp_metacharacter.rb → ...rubocop/cop/mixin/regexp_metacharacter.rb b/...rubocop/cop/mixin/regexp_metacharacter.rb → ...rubocop/cop/mixin/regexp_metacharacter.rb
diff --git a/....11.4/lib/rubocop/cop/mixin/sort_block.rb → ....11.5/lib/rubocop/cop/mixin/sort_block.rb b/....11.4/lib/rubocop/cop/mixin/sort_block.rb → ....11.5/lib/rubocop/cop/mixin/sort_block.rb
diff --git a/...ocop/cop/performance/ancestors_include.rb → ...ocop/cop/performance/ancestors_include.rb b/...ocop/cop/performance/ancestors_include.rb → ...ocop/cop/performance/ancestors_include.rb
diff --git a/...rmance/array_semi_infinite_range_slice.rb → ...rmance/array_semi_infinite_range_slice.rb b/...rmance/array_semi_infinite_range_slice.rb → ...rmance/array_semi_infinite_range_slice.rb
diff --git a/...ance/big_decimal_with_numeric_argument.rb → ...ance/big_decimal_with_numeric_argument.rb b/...ance/big_decimal_with_numeric_argument.rb → ...ance/big_decimal_with_numeric_argument.rb
diff --git a/.../lib/rubocop/cop/performance/bind_call.rb → .../lib/rubocop/cop/performance/bind_call.rb b/.../lib/rubocop/cop/performance/bind_call.rb → .../lib/rubocop/cop/performance/bind_call.rb
diff --git a/...rmance/block_given_with_explicit_block.rb → ...rmance/block_given_with_explicit_block.rb b/...rmance/block_given_with_explicit_block.rb → ...rmance/block_given_with_explicit_block.rb
diff --git a/...1.4/lib/rubocop/cop/performance/caller.rb → ...1.5/lib/rubocop/cop/performance/caller.rb b/...1.4/lib/rubocop/cop/performance/caller.rb → ...1.5/lib/rubocop/cop/performance/caller.rb
diff --git a/...ubocop/cop/performance/case_when_splat.rb → ...ubocop/cop/performance/case_when_splat.rb b/...ubocop/cop/performance/case_when_splat.rb → ...ubocop/cop/performance/case_when_splat.rb
diff --git a/....4/lib/rubocop/cop/performance/casecmp.rb → ....5/lib/rubocop/cop/performance/casecmp.rb b/....4/lib/rubocop/cop/performance/casecmp.rb → ....5/lib/rubocop/cop/performance/casecmp.rb
diff --git a/...cop/performance/chain_array_allocation.rb → ...cop/performance/chain_array_allocation.rb b/...cop/performance/chain_array_allocation.rb → ...cop/performance/chain_array_allocation.rb
diff --git a/...performance/collection_literal_in_loop.rb → ...performance/collection_literal_in_loop.rb b/...performance/collection_literal_in_loop.rb → ...performance/collection_literal_in_loop.rb
diff --git a/...cop/cop/performance/compare_with_block.rb → ...cop/cop/performance/compare_with_block.rb b/...cop/cop/performance/compare_with_block.rb → ...cop/cop/performance/compare_with_block.rb
diff --git a/...ubocop/cop/performance/constant_regexp.rb → ...ubocop/cop/performance/constant_regexp.rb b/...ubocop/cop/performance/constant_regexp.rb → ...ubocop/cop/performance/constant_regexp.rb
diff --git a/...11.4/lib/rubocop/cop/performance/count.rb → ...11.5/lib/rubocop/cop/performance/count.rb b/...11.4/lib/rubocop/cop/performance/count.rb → ...11.5/lib/rubocop/cop/performance/count.rb
diff --git a/.../rubocop/cop/performance/delete_prefix.rb → .../rubocop/cop/performance/delete_prefix.rb b/.../rubocop/cop/performance/delete_prefix.rb → .../rubocop/cop/performance/delete_prefix.rb
diff --git a/.../rubocop/cop/performance/delete_suffix.rb → .../rubocop/cop/performance/delete_suffix.rb b/.../rubocop/cop/performance/delete_suffix.rb → .../rubocop/cop/performance/delete_suffix.rb
diff --git a/...1.4/lib/rubocop/cop/performance/detect.rb → ...1.5/lib/rubocop/cop/performance/detect.rb b/...1.4/lib/rubocop/cop/performance/detect.rb → ...1.5/lib/rubocop/cop/performance/detect.rb
diff --git a/.../cop/performance/double_start_end_with.rb → .../cop/performance/double_start_end_with.rb b/.../cop/performance/double_start_end_with.rb → .../cop/performance/double_start_end_with.rb
diff --git a/...4/lib/rubocop/cop/performance/end_with.rb → ...5/lib/rubocop/cop/performance/end_with.rb b/...4/lib/rubocop/cop/performance/end_with.rb → ...5/lib/rubocop/cop/performance/end_with.rb
diff --git a/...lib/rubocop/cop/performance/fixed_size.rb → ...lib/rubocop/cop/performance/fixed_size.rb b/...lib/rubocop/cop/performance/fixed_size.rb → ...lib/rubocop/cop/performance/fixed_size.rb
diff --git a/...4/lib/rubocop/cop/performance/flat_map.rb → ...5/lib/rubocop/cop/performance/flat_map.rb b/...4/lib/rubocop/cop/performance/flat_map.rb → ...5/lib/rubocop/cop/performance/flat_map.rb
diff --git a/...op/performance/inefficient_hash_search.rb → ...op/performance/inefficient_hash_search.rb b/...op/performance/inefficient_hash_search.rb → ...op/performance/inefficient_hash_search.rb
diff --git a/...b/rubocop/cop/performance/io_readlines.rb → ...b/rubocop/cop/performance/io_readlines.rb b/...b/rubocop/cop/performance/io_readlines.rb → ...b/rubocop/cop/performance/io_readlines.rb
diff --git a/...ib/rubocop/cop/performance/map_compact.rb → ...ib/rubocop/cop/performance/map_compact.rb b/...ib/rubocop/cop/performance/map_compact.rb → ...ib/rubocop/cop/performance/map_compact.rb
@@ -66,7 +66,7 @@ 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) &&
+          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

diff --git a/...cop/performance/method_object_as_block.rb → ...cop/performance/method_object_as_block.rb b/...cop/performance/method_object_as_block.rb → ...cop/performance/method_object_as_block.rb
diff --git a/...ib/rubocop/cop/performance/open_struct.rb → ...ib/rubocop/cop/performance/open_struct.rb b/...ib/rubocop/cop/performance/open_struct.rb → ...ib/rubocop/cop/performance/open_struct.rb
diff --git a/.../rubocop/cop/performance/range_include.rb → .../rubocop/cop/performance/range_include.rb b/.../rubocop/cop/performance/range_include.rb → .../rubocop/cop/performance/range_include.rb
diff --git a/...p/cop/performance/redundant_block_call.rb → ...p/cop/performance/redundant_block_call.rb b/...p/cop/performance/redundant_block_call.rb → ...p/cop/performance/redundant_block_call.rb
diff --git a/...ce/redundant_equality_comparison_block.rb → ...ce/redundant_equality_comparison_block.rb b/...ce/redundant_equality_comparison_block.rb → ...ce/redundant_equality_comparison_block.rb
@@ -74,12 +74,27 @@ def same_block_argument_and_is_a_argument?(block_body, block_argument)
 
         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

diff --git a/...ubocop/cop/performance/redundant_match.rb → ...ubocop/cop/performance/redundant_match.rb b/...ubocop/cop/performance/redundant_match.rb → ...ubocop/cop/performance/redundant_match.rb
diff --git a/...ubocop/cop/performance/redundant_merge.rb → ...ubocop/cop/performance/redundant_merge.rb b/...ubocop/cop/performance/redundant_merge.rb → ...ubocop/cop/performance/redundant_merge.rb
diff --git a/...p/cop/performance/redundant_sort_block.rb → ...p/cop/performance/redundant_sort_block.rb b/...p/cop/performance/redundant_sort_block.rb → ...p/cop/performance/redundant_sort_block.rb
diff --git a/...rmance/redundant_split_regexp_argument.rb → ...rmance/redundant_split_regexp_argument.rb b/...rmance/redundant_split_regexp_argument.rb → ...rmance/redundant_split_regexp_argument.rb
diff --git a/...cop/performance/redundant_string_chars.rb → ...cop/performance/redundant_string_chars.rb b/...cop/performance/redundant_string_chars.rb → ...cop/performance/redundant_string_chars.rb
diff --git a/...b/rubocop/cop/performance/regexp_match.rb → ...b/rubocop/cop/performance/regexp_match.rb b/...b/rubocop/cop/performance/regexp_match.rb → ...b/rubocop/cop/performance/regexp_match.rb
diff --git a/...b/rubocop/cop/performance/reverse_each.rb → ...b/rubocop/cop/performance/reverse_each.rb b/...b/rubocop/cop/performance/reverse_each.rb → ...b/rubocop/cop/performance/reverse_each.rb
diff --git a/.../rubocop/cop/performance/reverse_first.rb → .../rubocop/cop/performance/reverse_first.rb b/.../rubocop/cop/performance/reverse_first.rb → .../rubocop/cop/performance/reverse_first.rb
diff --git a/...lib/rubocop/cop/performance/select_map.rb → ...lib/rubocop/cop/performance/select_map.rb b/...lib/rubocop/cop/performance/select_map.rb → ...lib/rubocop/cop/performance/select_map.rb
diff --git a/....11.4/lib/rubocop/cop/performance/size.rb → ....11.5/lib/rubocop/cop/performance/size.rb b/....11.4/lib/rubocop/cop/performance/size.rb → ....11.5/lib/rubocop/cop/performance/size.rb
diff --git a/...b/rubocop/cop/performance/sort_reverse.rb → ...b/rubocop/cop/performance/sort_reverse.rb b/...b/rubocop/cop/performance/sort_reverse.rb → ...b/rubocop/cop/performance/sort_reverse.rb
diff --git a/....4/lib/rubocop/cop/performance/squeeze.rb → ....5/lib/rubocop/cop/performance/squeeze.rb b/....4/lib/rubocop/cop/performance/squeeze.rb → ....5/lib/rubocop/cop/performance/squeeze.rb
diff --git a/...lib/rubocop/cop/performance/start_with.rb → ...lib/rubocop/cop/performance/start_with.rb b/...lib/rubocop/cop/performance/start_with.rb → ...lib/rubocop/cop/performance/start_with.rb
diff --git a/...rubocop/cop/performance/string_include.rb → ...rubocop/cop/performance/string_include.rb b/...rubocop/cop/performance/string_include.rb → ...rubocop/cop/performance/string_include.rb
diff --git a/...cop/cop/performance/string_replacement.rb → ...cop/cop/performance/string_replacement.rb b/...cop/cop/performance/string_replacement.rb → ...cop/cop/performance/string_replacement.rb
diff --git a/...1.11.4/lib/rubocop/cop/performance/sum.rb → ...1.11.5/lib/rubocop/cop/performance/sum.rb b/...1.11.4/lib/rubocop/cop/performance/sum.rb → ...1.11.5/lib/rubocop/cop/performance/sum.rb
diff --git a/.../lib/rubocop/cop/performance/times_map.rb → .../lib/rubocop/cop/performance/times_map.rb b/.../lib/rubocop/cop/performance/times_map.rb → .../lib/rubocop/cop/performance/times_map.rb
diff --git a/...ubocop/cop/performance/unfreeze_string.rb → ...ubocop/cop/performance/unfreeze_string.rb b/...ubocop/cop/performance/unfreeze_string.rb → ...ubocop/cop/performance/unfreeze_string.rb
diff --git a/...cop/cop/performance/uri_default_parser.rb → ...cop/cop/performance/uri_default_parser.rb b/...cop/cop/performance/uri_default_parser.rb → ...cop/cop/performance/uri_default_parser.rb
diff --git a/....11.4/lib/rubocop/cop/performance_cops.rb → ....11.5/lib/rubocop/cop/performance_cops.rb b/....11.4/lib/rubocop/cop/performance_cops.rb → ....11.5/lib/rubocop/cop/performance_cops.rb
diff --git a/...ormance-1.11.4/lib/rubocop/performance.rb → ...ormance-1.11.5/lib/rubocop/performance.rb b/...ormance-1.11.4/lib/rubocop/performance.rb → ...ormance-1.11.5/lib/rubocop/performance.rb
diff --git a/...-1.11.4/lib/rubocop/performance/inject.rb → ...-1.11.5/lib/rubocop/performance/inject.rb b/...-1.11.4/lib/rubocop/performance/inject.rb → ...-1.11.5/lib/rubocop/performance/inject.rb
diff --git a/...1.11.4/lib/rubocop/performance/version.rb → ...1.11.5/lib/rubocop/performance/version.rb b/...1.11.4/lib/rubocop/performance/version.rb → ...1.11.5/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.4'
+      STRING = '1.11.5'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s