rubocop 1.53.0 → 1.60.0

data/lib/rubocop/cop/style/arguments_forwarding.rb

@@ -8,6 +8,21 @@ module RuboCop
       # This cop identifies places where `do_something(*args, &block)`
       # can be replaced by `do_something(...)`.
       #
+      # In Ruby 3.2, anonymous args/kwargs forwarding has been added.
+      #
+      # This cop also identifies places where `use_args(*args)`/`use_kwargs(**kwargs)` can be
+      # replaced by `use_args(*)`/`use_kwargs(**)`; if desired, this functionality can be disabled
+      # by setting `UseAnonymousForwarding: false`.
+      #
+      # And this cop has `RedundantRestArgumentNames`, `RedundantKeywordRestArgumentNames`,
+      # and `RedundantBlockArgumentNames` options. This configuration is a list of redundant names
+      # that are sufficient for anonymizing meaningless naming.
+      #
+      # Meaningless names that are commonly used can be anonymized by default:
+      # e.g., `*args`, `**options`, `&block`, and so on.
+      #
+      # Names not on this list are likely to be meaningful and are allowed by default.
+      #
       # @example
       #   # bad
       #   def foo(*args, &block)
@@ -24,7 +39,27 @@ module RuboCop
       #     bar(...)
       #   end
       #
-      # @example AllowOnlyRestArgument: true (default)
+      # @example UseAnonymousForwarding: true (default, only relevant for Ruby >= 3.2)
+      #   # bad
+      #   def foo(*args, **kwargs)
+      #     args_only(*args)
+      #     kwargs_only(**kwargs)
+      #   end
+      #
+      #   # good
+      #   def foo(*, **)
+      #     args_only(*)
+      #     kwargs_only(**)
+      #   end
+      #
+      # @example UseAnonymousForwarding: false (only relevant for Ruby >= 3.2)
+      #   # good
+      #   def foo(*args, **kwargs)
+      #     args_only(*args)
+      #     kwargs_only(**kwargs)
+      #   end
+      #
+      # @example AllowOnlyRestArgument: true (default, only relevant for Ruby < 3.2)
       #   # good
       #   def foo(*args)
       #     bar(*args)
@@ -34,7 +69,7 @@ module RuboCop
       #     bar(**kwargs)
       #   end
       #
-      # @example AllowOnlyRestArgument: false
+      # @example AllowOnlyRestArgument: false (only relevant for Ruby < 3.2)
       #   # bad
       #   # The following code can replace the arguments with `...`,
       #   # but it will change the behavior. Because `...` forwards block also.
@@ -46,6 +81,38 @@ module RuboCop
       #     bar(**kwargs)
       #   end
       #
+      # @example RedundantRestArgumentNames: ['args', 'arguments'] (default)
+      #   # bad
+      #   def foo(*args)
+      #     bar(*args)
+      #   end
+      #
+      #   # good
+      #   def foo(*)
+      #     bar(*)
+      #   end
+      #
+      # @example RedundantKeywordRestArgumentNames: ['kwargs', 'options', 'opts'] (default)
+      #   # bad
+      #   def foo(**kwargs)
+      #     bar(**kwargs)
+      #   end
+      #
+      #   # good
+      #   def foo(**)
+      #     bar(**)
+      #   end
+      #
+      # @example RedundantBlockArgumentNames: ['blk', 'block', 'proc'] (default)
+      #   # bad
+      #   def foo(&block)
+      #     bar(&block)
+      #   end
+      #
+      #   # good
+      #   def foo(&)
+      #     bar(&)
+      #   end
       class ArgumentsForwarding < Base
         include RangeHelp
         extend AutoCorrector
@@ -53,102 +120,327 @@ module RuboCop
 
         minimum_target_ruby_version 2.7
 
-        MSG = 'Use arguments forwarding.'
-
-        # @!method use_rest_arguments?(node)
-        def_node_matcher :use_rest_arguments?, <<~PATTERN
-          (args ({restarg kwrestarg} $_) $...)
-        PATTERN
-
-        # @!method only_rest_arguments?(node, name)
-        def_node_matcher :only_rest_arguments?, <<~PATTERN
-          {
-            (send _ _ (splat (lvar %1)))
-            (send _ _ (hash (kwsplat (lvar %1))))
-          }
-        PATTERN
-
-        # @!method forwarding_method_arguments?(node, rest_name, block_name, kwargs_name)
-        def_node_matcher :forwarding_method_arguments?, <<~PATTERN
-          {
-            (send _ _
-              (splat (lvar %1))
-              (block-pass {(lvar %2) nil?}))
-            (send _ _
-              (splat (lvar %1))
-              (hash (kwsplat (lvar %3)))
-              (block-pass {(lvar %2) nil?}))
-          }
-        PATTERN
+        FORWARDING_LVAR_TYPES = %i[splat kwsplat block_pass].freeze
+        ADDITIONAL_ARG_TYPES = %i[lvar arg].freeze
+
+        FORWARDING_MSG = 'Use shorthand syntax `...` for arguments forwarding.'
+        ARGS_MSG = 'Use anonymous positional arguments forwarding (`*`).'
+        KWARGS_MSG = 'Use anonymous keyword arguments forwarding (`**`).'
+
+        def self.autocorrect_incompatible_with
+          [Naming::BlockForwarding]
+        end
 
         def on_def(node)
           return unless node.body
-          return unless (rest_args_name, args = use_rest_arguments?(node.arguments))
-          return if args.any?(&:default?)
 
-          node.each_descendant(:send) do |send_node|
-            kwargs_name, block_name = extract_argument_names_from(args)
+          restarg, kwrestarg, blockarg = extract_forwardable_args(node.arguments)
+          forwardable_args = redundant_forwardable_named_args(restarg, kwrestarg, blockarg)
+          send_nodes = node.each_descendant(:send).to_a
+
+          send_classifications = classify_send_nodes(
+            node, send_nodes, non_splat_or_block_pass_lvar_references(node.body), forwardable_args
+          )
 
-            next unless forwarding_method?(send_node, rest_args_name, kwargs_name, block_name) &&
-                        all_lvars_as_forwarding_method_arguments?(node, send_node)
+          return if send_classifications.empty?
 
-            register_offense_to_forwarding_method_arguments(send_node)
-            register_offense_to_method_definition_arguments(node)
+          if only_forwards_all?(send_classifications)
+            add_forward_all_offenses(node, send_classifications, forwardable_args)
+          elsif target_ruby_version >= 3.2
+            add_post_ruby_32_offenses(node, send_classifications, forwardable_args)
           end
         end
+
         alias on_defs on_def
 
         private
 
-        def extract_argument_names_from(args)
-          kwargs_name = args.first.source.delete('**') if args.first&.kwrestarg_type?
-          block_arg_name = args.last.source.delete('&') if args.last&.blockarg_type?
-
-          [kwargs_name, block_arg_name].map { |name| name&.to_sym }
+        def extract_forwardable_args(args)
+          [args.find(&:restarg_type?), args.find(&:kwrestarg_type?), args.find(&:blockarg_type?)]
         end
 
-        def forwarding_method?(node, rest_arg, kwargs, block_arg)
-          return only_rest_arguments?(node, rest_arg) unless allow_only_rest_arguments?
+        def redundant_forwardable_named_args(restarg, kwrestarg, blockarg)
+          restarg_node = redundant_named_arg(restarg, 'RedundantRestArgumentNames', '*')
+          kwrestarg_node = redundant_named_arg(kwrestarg, 'RedundantKeywordRestArgumentNames', '**')
+          blockarg_node = redundant_named_arg(blockarg, 'RedundantBlockArgumentNames', '&')
 
-          forwarding_method_arguments?(node, rest_arg, block_arg, kwargs)
+          [restarg_node, kwrestarg_node, blockarg_node]
         end
 
-        def all_lvars_as_forwarding_method_arguments?(def_node, forwarding_method)
-          lvars = def_node.body.each_descendant(:lvar, :lvasgn)
+        def only_forwards_all?(send_classifications)
+          send_classifications.all? { |_, c, _, _| c == :all }
+        end
 
-          begin_pos = forwarding_method.source_range.begin_pos
-          end_pos = forwarding_method.source_range.end_pos
+        def add_forward_all_offenses(node, send_classifications, forwardable_args)
+          send_classifications.each do |send_node, _c, forward_rest, _forward_kwrest|
+            register_forward_all_offense(send_node, send_node, forward_rest)
+          end
 
-          lvars.all? { |lvar| lvar.source_range.begin_pos.between?(begin_pos, end_pos) }
+          rest_arg, _kwrest_arg, _block_arg = *forwardable_args
+          register_forward_all_offense(node, node.arguments, rest_arg)
         end
 
-        def register_offense_to_forwarding_method_arguments(forwarding_method)
-          add_offense(arguments_range(forwarding_method)) do |corrector|
-            begin_pos = forwarding_method.loc.selector&.end_pos || forwarding_method.loc.dot.end_pos
-            range = range_between(begin_pos, forwarding_method.source_range.end_pos)
+        def add_post_ruby_32_offenses(def_node, send_classifications, forwardable_args)
+          return unless use_anonymous_forwarding?
+
+          rest_arg, kwrest_arg, _block_arg = *forwardable_args
+
+          send_classifications.each do |send_node, _c, forward_rest, forward_kwrest|
+            if outside_block?(forward_rest)
+              register_forward_args_offense(def_node.arguments, rest_arg)
+              register_forward_args_offense(send_node, forward_rest)
+            end
 
-            corrector.replace(range, '(...)')
+            if outside_block?(forward_kwrest)
+              register_forward_kwargs_offense(!forward_rest, def_node.arguments, kwrest_arg)
+              register_forward_kwargs_offense(!forward_rest, send_node, forward_kwrest)
+            end
           end
         end
 
-        def register_offense_to_method_definition_arguments(method_definition)
-          add_offense(arguments_range(method_definition)) do |corrector|
-            arguments_range = range_with_surrounding_space(
-              method_definition.arguments.source_range, side: :left
+        def non_splat_or_block_pass_lvar_references(body)
+          body.each_descendant(:lvar, :lvasgn).filter_map do |lvar|
+            parent = lvar.parent
+
+            next if lvar.lvar_type? && FORWARDING_LVAR_TYPES.include?(parent.type)
+
+            lvar.children.first
+          end.uniq
+        end
+
+        def classify_send_nodes(def_node, send_nodes, referenced_lvars, forwardable_args)
+          send_nodes.filter_map do |send_node|
+            classification_and_forwards = classification_and_forwards(
+              def_node,
+              send_node,
+              referenced_lvars,
+              forwardable_args
             )
-            corrector.replace(arguments_range, '(...)')
+
+            next unless classification_and_forwards
+
+            [send_node, *classification_and_forwards]
           end
         end
 
-        def arguments_range(node)
-          arguments = node.arguments
+        def classification_and_forwards(def_node, send_node, referenced_lvars, forwardable_args)
+          classifier = SendNodeClassifier.new(
+            def_node,
+            send_node,
+            referenced_lvars,
+            forwardable_args,
+            target_ruby_version: target_ruby_version,
+            allow_only_rest_arguments: allow_only_rest_arguments?
+          )
+
+          classification = classifier.classification
 
-          range_between(arguments.first.source_range.begin_pos, arguments.last.source_range.end_pos)
+          return unless classification
+
+          [classification, classifier.forwarded_rest_arg, classifier.forwarded_kwrest_arg]
+        end
+
+        def redundant_named_arg(arg, config_name, keyword)
+          return nil unless arg
+
+          redundant_arg_names = cop_config.fetch(config_name, []).map do |redundant_arg_name|
+            "#{keyword}#{redundant_arg_name}"
+          end << keyword
+
+          redundant_arg_names.include?(arg.source) ? arg : nil
+        end
+
+        def outside_block?(node)
+          return false unless node
+
+          node.each_ancestor(:block, :numblock).none?
+        end
+
+        def register_forward_args_offense(def_arguments_or_send, rest_arg_or_splat)
+          add_offense(rest_arg_or_splat, message: ARGS_MSG) do |corrector|
+            add_parens_if_missing(def_arguments_or_send, corrector)
+
+            corrector.replace(rest_arg_or_splat, '*')
+          end
+        end
+
+        def register_forward_kwargs_offense(add_parens, def_arguments_or_send, kwrest_arg_or_splat)
+          add_offense(kwrest_arg_or_splat, message: KWARGS_MSG) do |corrector|
+            add_parens_if_missing(def_arguments_or_send, corrector) if add_parens
+
+            corrector.replace(kwrest_arg_or_splat, '**')
+          end
+        end
+
+        def register_forward_all_offense(def_or_send, send_or_arguments, rest_or_splat)
+          arg_range = arguments_range(def_or_send, rest_or_splat)
+
+          add_offense(arg_range, message: FORWARDING_MSG) do |corrector|
+            add_parens_if_missing(send_or_arguments, corrector)
+
+            corrector.replace(arg_range, '...')
+          end
+        end
+
+        def arguments_range(node, first_node)
+          arguments = node.arguments.reject { |arg| ADDITIONAL_ARG_TYPES.include?(arg.type) }
+
+          start_node = first_node || arguments.first
+
+          range_between(start_node.source_range.begin_pos, arguments.last.source_range.end_pos)
         end
 
         def allow_only_rest_arguments?
           cop_config.fetch('AllowOnlyRestArgument', true)
         end
+
+        def use_anonymous_forwarding?
+          cop_config.fetch('UseAnonymousForwarding', false)
+        end
+
+        def add_parens_if_missing(node, corrector)
+          return if parentheses?(node)
+
+          add_parentheses(node, corrector)
+        end
+
+        # Classifies send nodes for possible rest/kwrest/all (including block) forwarding.
+        class SendNodeClassifier
+          extend NodePattern::Macros
+
+          # @!method forwarded_rest_arg?(node, rest_name)
+          def_node_matcher :forwarded_rest_arg?, '(splat (lvar %1))'
+
+          # @!method extract_forwarded_kwrest_arg(node, kwrest_name)
+          def_node_matcher :extract_forwarded_kwrest_arg, '(hash <$(kwsplat (lvar %1)) ...>)'
+
+          # @!method forwarded_block_arg?(node, block_name)
+          def_node_matcher :forwarded_block_arg?, '(block_pass {(lvar %1) nil?})'
+
+          def initialize(def_node, send_node, referenced_lvars, forwardable_args, **config)
+            @def_node = def_node
+            @send_node = send_node
+            @referenced_lvars = referenced_lvars
+            @rest_arg, @kwrest_arg, @block_arg = *forwardable_args
+            @rest_arg_name, @kwrest_arg_name, @block_arg_name =
+              *forwardable_args.map { |a| a&.name }
+            @config = config
+          end
+
+          def forwarded_rest_arg
+            return nil if referenced_rest_arg?
+
+            arguments.find { |arg| forwarded_rest_arg?(arg, @rest_arg_name) }
+          end
+
+          def forwarded_kwrest_arg
+            return nil if referenced_kwrest_arg?
+
+            arguments.filter_map { |arg| extract_forwarded_kwrest_arg(arg, @kwrest_arg_name) }.first
+          end
+
+          def forwarded_block_arg
+            return nil if referenced_block_arg?
+
+            arguments.find { |arg| forwarded_block_arg?(arg, @block_arg_name) }
+          end
+
+          def classification
+            return nil unless forwarded_rest_arg || forwarded_kwrest_arg || forwarded_block_arg
+
+            if can_forward_all?
+              :all
+            else
+              :rest_or_kwrest
+            end
+          end
+
+          private
+
+          def can_forward_all?
+            return false if any_arg_referenced?
+            return false if ruby_32_missing_rest_or_kwest?
+            return false unless offensive_block_forwarding?
+            return false if additional_kwargs_or_forwarded_kwargs?
+
+            no_additional_args? || (target_ruby_version >= 3.0 && no_post_splat_args?)
+          end
+
+          def ruby_32_missing_rest_or_kwest?
+            target_ruby_version >= 3.2 && !forwarded_rest_and_kwrest_args
+          end
+
+          def offensive_block_forwarding?
+            @block_arg ? forwarded_block_arg : allow_offense_for_no_block?
+          end
+
+          def forwarded_rest_and_kwrest_args
+            forwarded_rest_arg && forwarded_kwrest_arg
+          end
+
+          def arguments
+            @send_node.arguments
+          end
+
+          def referenced_rest_arg?
+            @referenced_lvars.include?(@rest_arg_name)
+          end
+
+          def referenced_kwrest_arg?
+            @referenced_lvars.include?(@kwrest_arg_name)
+          end
+
+          def referenced_block_arg?
+            @referenced_lvars.include?(@block_arg_name)
+          end
+
+          def any_arg_referenced?
+            referenced_rest_arg? || referenced_kwrest_arg? || referenced_block_arg?
+          end
+
+          def target_ruby_version
+            @config.fetch(:target_ruby_version)
+          end
+
+          def no_post_splat_args?
+            return true unless (splat_index = arguments.index(forwarded_rest_arg))
+
+            arg_after_splat = arguments[splat_index + 1]
+            [nil, :hash, :block_pass].include?(arg_after_splat&.type)
+          end
+
+          def additional_kwargs_or_forwarded_kwargs?
+            additional_kwargs? || forward_additional_kwargs?
+          end
+
+          def additional_kwargs?
+            @def_node.arguments.any? { |a| a.kwarg_type? || a.kwoptarg_type? }
+          end
+
+          def forward_additional_kwargs?
+            return false unless forwarded_kwrest_arg
+
+            !forwarded_kwrest_arg.parent.children.one?
+          end
+
+          def allow_offense_for_no_block?
+            !@config.fetch(:allow_only_rest_arguments)
+          end
+
+          def no_additional_args?
+            forwardable_count = [@rest_arg, @kwrest_arg, @block_arg].compact.size
+
+            return false if missing_rest_arg_or_kwrest_arg?
+
+            @def_node.arguments.size == forwardable_count &&
+              @send_node.arguments.size == forwardable_count
+          end
+
+          def missing_rest_arg_or_kwrest_arg?
+            (@rest_arg_name && !forwarded_rest_arg) ||
+              (@kwrest_arg_name && !forwarded_kwrest_arg)
+          end
+        end
       end
     end
   end

data/lib/rubocop/cop/style/array_first_last.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # Identifies usages of `arr[0]` and `arr[-1]` and suggests to change
+      # them to use `arr.first` and `arr.last` instead.
+      #
+      # The cop is disabled by default due to safety concerns.
+      #
+      # @safety
+      #   This cop is unsafe because `[0]` or `[-1]` can be called on a Hash,
+      #   which returns a value for `0` or `-1` key, but changing these to use
+      #   `.first` or `.last` will return first/last tuple instead. Also, String
+      #   does not implement `first`/`last` methods.
+      #
+      # @example
+      #   # bad
+      #   arr[0]
+      #   arr[-1]
+      #
+      #   # good
+      #   arr.first
+      #   arr.last
+      #   arr[0] = 2
+      #   arr[0][-2]
+      #
+      class ArrayFirstLast < Base
+        extend AutoCorrector
+
+        MSG = 'Use `%<preferred>s`.'
+        RESTRICT_ON_SEND = %i[[]].freeze
+
+        # rubocop:disable Metrics/AbcSize
+        def on_send(node)
+          return unless node.arguments.size == 1 && node.first_argument.int_type?
+
+          value = node.first_argument.value
+          return unless [0, -1].include?(value)
+
+          node = innermost_braces_node(node)
+          return if node.parent && brace_method?(node.parent)
+
+          preferred = (value.zero? ? 'first' : 'last')
+          add_offense(node.loc.selector, message: format(MSG, preferred: preferred)) do |corrector|
+            corrector.replace(node.loc.selector, ".#{preferred}")
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        private
+
+        def innermost_braces_node(node)
+          node = node.receiver while node.receiver.send_type? && node.receiver.method?(:[])
+          node
+        end
+
+        def brace_method?(node)
+          node.send_type? && (node.method?(:[]) || node.method?(:[]=))
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/style/array_intersect.rb

@@ -11,6 +11,15 @@ module RuboCop
       # The `array1.intersect?(array2)` method is faster than
       # `(array1 & array2).any?` and is more readable.
       #
+      # In cases like the following, compatibility is not ensured,
+      # so it will not be detected when using block argument.
+      #
+      # [source,ruby]
+      # ----
+      # ([1] & [1,2]).any? { |x| false }    # => false
+      # [1].intersect?([1,2]) { |x| false } # => true
+      # ----
+      #
       # @safety
       #   This cop cannot guarantee that `array1` and `array2` are
       #   actually arrays while method `intersect?` is for arrays only.
@@ -68,16 +77,15 @@ module RuboCop
         RESTRICT_ON_SEND = (STRAIGHT_METHODS + NEGATED_METHODS).freeze
 
         def on_send(node)
+          return if (parent = node.parent) && (parent.block_type? || parent.numblock_type?)
           return unless (receiver, argument, method_name = bad_intersection_check?(node))
 
           message = message(receiver.source, argument.source, method_name)
 
           add_offense(node, message: message) do |corrector|
-            if straight?(method_name)
-              corrector.replace(node, "#{receiver.source}.intersect?(#{argument.source})")
-            else
-              corrector.replace(node, "!#{receiver.source}.intersect?(#{argument.source})")
-            end
+            bang = straight?(method_name) ? '' : '!'
+
+            corrector.replace(node, "#{bang}#{receiver.source}.intersect?(#{argument.source})")
           end
         end
 

data/lib/rubocop/cop/style/auto_resource_cleanup.rb

@@ -16,31 +16,38 @@ module RuboCop
       #   File.open('file') do |f|
       #     # ...
       #   end
+      #
+      #   # bad
+      #   f = Tempfile.open('temp')
+      #
+      #   # good
+      #   Tempfile.open('temp') do |f|
+      #     # ...
+      #   end
       class AutoResourceCleanup < Base
-        MSG = 'Use the block version of `%<class>s.%<method>s`.'
-
-        TARGET_METHODS = { File: :open }.freeze
+        MSG = 'Use the block version of `%<current>s`.'
+        RESTRICT_ON_SEND = %i[open].freeze
 
-        RESTRICT_ON_SEND = TARGET_METHODS.values.freeze
+        # @!method file_open_method?(node)
+        def_node_matcher :file_open_method?, <<~PATTERN
+          (send (const {nil? cbase} {:File :Tempfile}) :open ...)
+        PATTERN
 
         def on_send(node)
-          TARGET_METHODS.each do |target_class, target_method|
-            next if node.method_name != target_method
+          return if !file_open_method?(node) || cleanup?(node)
 
-            target_receiver = s(:const, nil, target_class)
-            next if node.receiver != target_receiver
+          current = node.receiver.source_range.begin.join(node.selector.end).source
 
-            next if cleanup?(node)
-
-            add_offense(node, message: format(MSG, class: target_class, method: target_method))
-          end
+          add_offense(node, message: format(MSG, current: current))
         end
 
         private
 
         def cleanup?(node)
-          parent = node.parent
-          node.block_argument? || (parent && (parent.block_type? || !parent.lvasgn_type?))
+          return true if node.block_argument?
+          return false unless (parent = node.parent)
+
+          parent.block_type? || !parent.lvasgn_type?
         end
       end
     end

data/lib/rubocop/cop/style/bisected_attr_accessor.rb

@@ -33,7 +33,7 @@ module RuboCop
         def on_class(class_node)
           @macros_to_rewrite[class_node] = Set.new
 
-          find_macros(class_node.body).each do |_visibility, macros|
+          find_macros(class_node.body).each_value do |macros|
             bisected = find_bisection(macros)
             next unless bisected.any?
 
@@ -74,7 +74,7 @@ module RuboCop
         def find_macros(class_def)
           # Find all the macros (`attr_reader`, `attr_writer`, etc.) in the class body
           # and turn them into `Macro` objects so that they can be processed.
-          return [] if !class_def || class_def.def_type?
+          return {} if !class_def || class_def.def_type?
 
           send_nodes =
             if class_def.send_type?

data/lib/rubocop/cop/style/block_delimiters.rb

@@ -370,7 +370,8 @@ module RuboCop
         def special_method_proper_block_style?(node)
           method_name = node.method_name
           return true if allowed_method?(method_name) || matches_allowed_pattern?(method_name)
-          return node.braces? if braces_required_method?(method_name)
+
+          node.braces? if braces_required_method?(method_name)
         end
 
         def braces_required_method?(method_name)