rubocop 1.91.0 → 1.92.2

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

@@ -45,6 +45,8 @@ module RuboCop
         MSG_TRAILING_CONDITIONAL = 'Do not use trailing conditionals in string interpolation.'
         MSG_TERNARY = 'Do not return empty strings in string interpolation.'
 
+        INTERPOLATED_TYPES = %i[dstr dsym regexp xstr].freeze
+
         def on_interpolation(node)
           node.each_child_node(:if) do |child_node|
             if style == :trailing_conditional
@@ -63,28 +65,54 @@ module RuboCop
           return if child_node.modifier_form?
 
           if empty_if_outcome?(child_node)
-            ternary_style_autocorrect(child_node, child_node.else_branch.source, 'unless')
+            ternary_style_autocorrect(child_node, child_node.else_branch, 'unless')
           end
 
           return unless empty_else_outcome?(child_node)
 
-          ternary_style_autocorrect(child_node, child_node.if_branch.source, 'if')
+          ternary_style_autocorrect(child_node, child_node.if_branch, 'if')
         end
 
         def ternary_correction(node, child_node)
           return unless child_node.modifier_form?
 
-          ternary_component = if child_node.unless?
-                                "'' : #{child_node.if_branch.source}"
-                              else
-                                "#{child_node.if_branch.source} : ''"
-                              end
-
           add_offense(node, message: MSG_TRAILING_CONDITIONAL) do |corrector|
-            corrector.replace(node, "\#{#{child_node.condition.source} ? #{ternary_component}}")
+            next if nested_trailing_conditional?(child_node)
+
+            autocorrect_to_ternary(corrector, child_node)
+          end
+        end
+
+        def nested_trailing_conditional?(if_node)
+          if_node.each_descendant(:if).any? do |node|
+            node.modifier_form? && node.parent.parent&.type?(*INTERPOLATED_TYPES)
           end
         end
 
+        def autocorrect_to_ternary(corrector, if_node)
+          condition = if_node.condition.source
+          branch = ternary_branch_source(if_node.if_branch)
+          outcomes = if_node.unless? ? "'' : #{branch}" : "#{branch} : ''"
+
+          corrector.replace(if_node, "#{condition} ? #{outcomes}")
+        end
+
+        def ternary_branch_source(branch)
+          return branch.source unless command_call?(branch)
+
+          arguments = branch.first_argument.source_range.join(branch.last_argument.source_range)
+          method = branch.source_range.begin.join(arguments.begin).source.rstrip
+
+          "#{method}(#{arguments.source})"
+        end
+
+        def command_call?(node)
+          return false unless node.type?(:call, :super, :yield) && node.arguments?
+          return false if node.call_type? && (node.operator_method? || node.setter_method?)
+
+          !node.parenthesized?
+        end
+
         def empty_if_outcome?(node)
           empty_branch_outcome?(node.if_branch)
         end
@@ -99,9 +127,23 @@ module RuboCop
           branch.nil_type? || (branch.str_type? && branch.value.empty?)
         end
 
-        def ternary_style_autocorrect(node, outcome, condition)
+        def ternary_style_autocorrect(node, outcome, keyword)
           add_offense(node, message: MSG_TERNARY) do |corrector|
-            corrector.replace(node, "#{outcome} #{condition} #{node.condition.source}")
+            next if empty_string_conditional_in_condition?(node)
+
+            head = node.source_range.begin.join(outcome.source_range.begin)
+            tail = outcome.source_range.end.join(node.source_range.end)
+
+            corrector.remove(head)
+            corrector.replace(tail, " #{keyword} #{node.condition.source}")
+          end
+        end
+
+        def empty_string_conditional_in_condition?(if_node)
+          if_node.condition.each_descendant(:if).any? do |node|
+            next false if node.modifier_form? || !node.parent.parent&.type?(*INTERPOLATED_TYPES)
+
+            empty_if_outcome?(node) || empty_else_outcome?(node)
           end
         end
       end

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

@@ -131,7 +131,9 @@ module RuboCop
       #
       class EndlessMethod < Base
         include ConfigurableEnforcedStyle
+        include LineLengthHelp
         include EndlessMethodRewriter
+        include EndlessMethodBodyHelp
         extend TargetRubyVersion
         extend AutoCorrector
 
@@ -143,6 +145,25 @@ module RuboCop
         MSG_REQUIRE_SINGLE = 'Use endless method definitions for single line methods.'
         MSG_REQUIRE_ALWAYS = 'Use endless method definitions.'
 
+        # `Style/MethodDefParentheses` adds the same parentheses a parameter list needs in
+        # an endless definition, so letting both correct in the same pass would double them.
+        # `Style/GuardClause` turns a single `if` body into several statements,
+        # which an endless definition cannot hold.
+        # `Style/RaiseArgs` would drop the parentheses of a `raise` that becomes
+        # the body in the same pass, which a method passed as an argument needs.
+        # `Style/IfUnlessModifier` and `Style/WhileUntilModifier` would turn the body into
+        # a modifier form, which then applies to the whole endless definition.
+        def self.autocorrect_incompatible_with
+          [
+            Style::GuardClause,
+            Style::IfUnlessModifier,
+            Style::MethodCallWithArgsParentheses,
+            Style::MethodDefParentheses,
+            Style::RaiseArgs,
+            Style::WhileUntilModifier
+          ]
+        end
+
         def on_def(node)
           return if node.assignment_method? || use_heredoc?(node)
 
@@ -177,9 +198,7 @@ module RuboCop
             add_offense(node, message: MSG_MULTI_LINE) do |corrector|
               correct_to_multiline(corrector, node)
             end
-          elsif !node.endless? && can_be_made_endless?(node) && single_line_when_made_endless?(node)
-            return if too_long_when_made_endless?(node)
-
+          elsif convertible_to_endless?(node) && single_line_when_made_endless?(node)
             add_offense(node, message: MSG_REQUIRE_SINGLE) do |corrector|
               correct_to_endless(corrector, node)
             end
@@ -187,14 +206,18 @@ module RuboCop
         end
 
         def handle_require_always_style(node)
-          return if node.endless? || !can_be_made_endless?(node)
-          return if too_long_when_made_endless?(node)
+          return unless convertible_to_endless?(node)
 
           add_offense(node, message: MSG_REQUIRE_ALWAYS) do |corrector|
             correct_to_endless(corrector, node)
           end
         end
 
+        def convertible_to_endless?(node)
+          !node.endless? && can_be_made_endless?(node) &&
+            !too_long_when_made_endless?(node) && !ambiguous_when_made_endless?(node)
+        end
+
         def handle_disallow_style(node)
           return unless node.endless?
 
@@ -213,12 +236,26 @@ module RuboCop
           return false unless (body = node.body)
           return true if body.any_str_type? && body.heredoc?
 
-          body.each_descendant(:str).any?(&:heredoc?)
+          body.each_descendant(:any_str).any?(&:heredoc?)
         end
 
         def correct_to_endless(corrector, node)
-          corrector.replace(signature_to_body_range(node), ' = ')
-          corrector.remove(node.body.source_range.end.join(node.loc.end.end))
+          if unparenthesized_arguments?(node)
+            corrector.replace(name_to_arguments_range(node), '(')
+            corrector.replace(signature_to_body_range(node), ') = ')
+          else
+            corrector.replace(signature_to_body_range(node), ' = ')
+          end
+
+          corrector.remove(body_to_end_range(node))
+        end
+
+        def unparenthesized_arguments?(node)
+          node.arguments.any? && !node.arguments.loc.begin
+        end
+
+        def name_to_arguments_range(node)
+          node.loc.name.end.join(node.arguments.source_range.begin)
         end
 
         def signature_to_body_range(node)
@@ -227,6 +264,10 @@ module RuboCop
           signature_end.join(node.body.source_range.begin)
         end
 
+        def body_to_end_range(node)
+          node.body.source_range.end.join(node.loc.end.end)
+        end
+
         def endless_replacement(node)
           <<~RUBY.strip
             def #{receiver(node)}#{node.method_name}#{arguments(node)} = #{node.body.source}
@@ -238,21 +279,73 @@ module RuboCop
         end
 
         def arguments(node, missing = '')
-          node.arguments.any? ? node.arguments.source : missing
+          return missing unless node.arguments.any?
+          return parenthesized_arguments(node) if unparenthesized_arguments?(node)
+
+          node.arguments.source
+        end
+
+        def parenthesized_arguments(node)
+          padding = space_inside_parens? ? ' ' : ''
+
+          "(#{padding}#{node.arguments.source}#{padding})"
+        end
+
+        def space_inside_parens?
+          return false unless config.cop_enabled?('Layout/SpaceInsideParens')
+
+          config.for_cop('Layout/SpaceInsideParens')['EnforcedStyle'] != 'no_space'
         end
 
         def can_be_made_endless?(node)
-          node.body && !node.body.type?(:begin, :kwbegin, :rescue, :ensure)
+          return false unless node.body
+          return false if comment_in_discarded_range?(node)
+
+          endless_method_body?(node.body)
         end
 
         def single_line_when_made_endless?(node)
           !endless_replacement(node).include?("\n")
         end
 
+        def ambiguous_when_made_endless?(node)
+          (operation = ambiguous_operation(node)) && ambiguous_enclosing_operation?(operation)
+        end
+
+        # @!method ambiguous_operation(node)
+        def_node_matcher :ambiguous_operation, <<~PATTERN
+          ^${
+            (if _ <any_def _>)
+            ({and or} any_def _)
+            ({while until} _ any_def)
+          }
+        PATTERN
+
+        def ambiguous_enclosing_operation?(operation)
+          operation.operator_keyword? || operation.modifier_form?
+        end
+
         def too_long_when_made_endless?(node)
           return false unless config.cop_enabled?('Layout/LineLength')
 
-          endless_replacement(node).length + node.loc.column > max_line_length
+          line_length(line_when_made_endless(node)) > max_line_length
+        end
+
+        def comment_in_discarded_range?(node)
+          discarded_ranges = [signature_to_body_range(node), body_to_end_range(node)]
+
+          processed_source.each_comment_in_lines(node.first_line..node.last_line).any? do |comment|
+            discarded_ranges.any? { |range| range.contains?(comment.source_range) }
+          end
+        end
+
+        def line_when_made_endless(node)
+          keyword_element = node.loc.keyword
+          code_before = keyword_element.source_line[0...keyword_element.column]
+          end_element = node.loc.end
+          code_after = end_element.source_line[end_element.last_column..]
+
+          "#{code_before}#{endless_replacement(node)}#{code_after}"
         end
       end
     end

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

@@ -5,11 +5,15 @@ module RuboCop
     module Style
       # Checks for exact regexp match inside `Regexp` literals.
       #
+      # `=~` returns an index and `match` returns `MatchData`, so they are only
+      # autocorrected when their value is used as a condition. The same goes for
+      # safe navigation calls, which return `nil` for a `nil` receiver.
+      #
       # @example
       #
       #   # bad
       #   string =~ /\Astring\z/
-      #   string === /\Astring\z/
+      #   /\Astring\z/ === string
       #   string.match(/\Astring\z/)
       #   string.match?(/\Astring\z/)
       #
@@ -27,14 +31,15 @@ module RuboCop
 
         MSG = 'Use `%<prefer>s`.'
         RESTRICT_ON_SEND = %i[=~ === !~ match match?].freeze
+        BOOLEAN_METHODS = %i[=== !~ match?].to_set.freeze
 
+        # `String#===` is plain equality, so `===` only matches with the regexp as its receiver.
         # @!method exact_regexp_match(node)
         def_node_matcher :exact_regexp_match, <<~PATTERN
-          (call
-            _ {:=~ :=== :!~ :match :match?}
-            (regexp
-              (str $_)
-              (regopt)))
+          {
+            (call _ {:=~ :!~ :match :match?} (regexp (str $_) (regopt)))
+            (send (regexp (str $_) (regopt)) :=== _)
+          }
         PATTERN
 
         def on_send(node)
@@ -44,16 +49,48 @@ module RuboCop
           return unless exact_match_pattern?(parsed_regexp)
 
           string = escape_single_quotes(parsed_regexp[1].text)
-          prefer = "#{receiver.source} #{new_method(node)} '#{string}'"
+          subject = node.method?(:===) ? node.first_argument : receiver
+          prefer = "#{subject.source} #{new_method(node)} '#{string}'"
 
           add_offense(node, message: format(MSG, prefer: prefer)) do |corrector|
-            corrector.replace(node, prefer)
+            autocorrect(corrector, node, prefer)
           end
         end
         alias on_csend on_send
 
         private
 
+        def autocorrect(corrector, node, prefer)
+          return unless boolean_result?(node) || truthiness_only?(node)
+
+          corrector.replace(node, parenthesize?(node) ? "(#{prefer})" : prefer)
+        end
+
+        # `=~` returns an index, `match` returns `MatchData` and `&.` can return `nil`,
+        # so replacing them with `==` is only safe where the value is used as a condition.
+        def boolean_result?(node)
+          node.send_type? && BOOLEAN_METHODS.include?(node.method_name)
+        end
+
+        def truthiness_only?(node)
+          return true unless node.value_used?
+
+          parent = node.parent
+          if parent.type?(:begin, :and, :or)
+            truthiness_only?(parent)
+          elsif parent.type?(:if, :while, :until)
+            parent.condition.equal?(node)
+          else
+            parent.send_type? && parent.method?(:!)
+          end
+        end
+
+        def parenthesize?(node)
+          return false unless (parent = node.parent)&.call_type?
+
+          parent.receiver.equal?(node) || (parent.operator_method? && !parent.method?(:[]))
+        end
+
         # Escape characters that are special inside a single-quoted string so the
         # generated literal (e.g. for `/\Afoo'bar\z/`) stays valid Ruby.
         def escape_single_quotes(text)

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

@@ -50,8 +50,11 @@ module RuboCop
           (block $_ (args $...) (yield $...))
         PATTERN
 
+        # `Style/LambdaCall` rewrites the `call` that the block argument is appended to, and
+        # `Style/TrailingCommaInArguments` changes the trailing comma where it is appended,
+        # in the same pass.
         def self.autocorrect_incompatible_with
-          [Lint::UnusedMethodArgument]
+          [Lint::UnusedMethodArgument, Style::LambdaCall, Style::TrailingCommaInArguments]
         end
 
         def initialize(config = nil, options = nil)
@@ -70,10 +73,13 @@ module RuboCop
             # this is not a valid ruby pattern, but can happen in haml or erb,
             # so this can cause crashes in haml_lint
             return unless def_node
+            return if argument_forwarding?(def_node)
 
             block_name = extract_block_name(def_node)
 
             add_offense(block_node) do |corrector|
+              next unless can_add_block_argument?(def_node, send_node, block_name)
+
               corrector.remove(block_body_range(block_node, send_node))
 
               add_block_argument(send_node, corrector, block_name)
@@ -84,6 +90,11 @@ module RuboCop
 
         private
 
+        # A block parameter can't be added next to `...`.
+        def argument_forwarding?(def_node)
+          def_node.arguments.any?(&:forward_arg_type?)
+        end
+
         def extract_block_name(def_node)
           if def_node.block_argument?
             def_node.last_argument.name
@@ -92,6 +103,27 @@ module RuboCop
           end
         end
 
+        def can_add_block_argument?(def_node, send_node, block_name)
+          return false if block_name_taken?(def_node, block_name)
+
+          !send_node.zsuper_type? || zsuper_arguments_forwardable?(def_node)
+        end
+
+        def block_name_taken?(def_node, block_name)
+          return false if def_node.block_argument?
+
+          def_node.each_descendant(:argument, :lvasgn).any? { |node| node.name.to_s == block_name }
+        end
+
+        # A destructuring argument can only be passed on as the original value,
+        # and anonymous arguments can only be forwarded since Ruby 3.2.
+        def zsuper_arguments_forwardable?(def_node)
+          def_node.arguments.none? do |arg|
+            arg.mlhs_type? ||
+              (arg.type?(:restarg, :kwrestarg) && !arg.name && target_ruby_version < 3.2)
+          end
+        end
+
         def yielding_arguments?(block_args, yield_args)
           yield_args = yield_args.dup.fill(
             nil,
@@ -110,6 +142,8 @@ module RuboCop
             insert_argument(node, corrector, block_name)
           elsif empty_arguments?(node)
             corrector.replace(node.arguments, "(&#{block_name})")
+          elsif index_call?(node)
+            corrector.replace(node.loc.selector, "[&#{block_name}]")
           elsif call_like?(node)
             correct_call_node(node, corrector, block_name)
           else
@@ -122,6 +156,10 @@ module RuboCop
           node.arguments.is_a?(RuboCop::AST::Node) && node.arguments.loc.begin
         end
 
+        def index_call?(node)
+          node.send_type? && node.method?(:[]) && !node.loc?(:dot)
+        end
+
         def call_like?(node)
           node.type?(:call, :zsuper, :super)
         end
@@ -141,19 +179,21 @@ module RuboCop
                           else
                             "&#{block_name}"
                           end
-          corrector.insert_after(node, "(#{new_arguments})")
-          return unless node.parenthesized?
-
-          args_begin = Util.args_begin(node)
-          args_end = Util.args_end(node)
-          range = range_between(args_begin.begin_pos, args_end.end_pos)
-          corrector.remove(range)
+          if node.parenthesized?
+            corrector.replace(node.loc.begin.join(node.loc.end), "(#{new_arguments})")
+          else
+            corrector.insert_after(node, "(#{new_arguments})")
+          end
         end
 
         def build_new_arguments_for_zsuper(node)
           def_node = node.each_ancestor(:any_def).first
-          def_node.arguments.map do |arg|
-            arg.optarg_type? ? arg.node_parts[0] : arg.source
+          def_node.arguments.filter_map do |arg|
+            case arg.type
+            when :arg, :optarg then arg.name.to_s
+            when :kwarg, :kwoptarg then "#{arg.name}: #{arg.name}"
+            when :restarg, :kwrestarg then arg.source
+            end
           end
         end
 

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

@@ -97,6 +97,7 @@ module RuboCop
 
         def on_send(node)
           return unless offense_condition?(node)
+          return if comment_before_to_f?(node)
 
           add_offense(node) do |corrector|
             case style
@@ -141,8 +142,42 @@ module RuboCop
         end
 
         def remove_to_f_method(corrector, send_node)
-          corrector.remove(send_node.loc.dot)
-          corrector.remove(send_node.loc.selector)
+          corrector.remove(send_node.receiver.source_range.end.join(send_node.loc.selector.end))
+        end
+
+        def comment_before_to_f?(node)
+          return true if comment_around_fdiv_operator?(node)
+
+          operands_losing_to_f(node).any? do |operand|
+            next false unless to_f_method?(operand)
+
+            range = operand.receiver.source_range.end.join(operand.loc.selector.begin)
+            comment_in_range?(range)
+          end
+        end
+
+        def comment_around_fdiv_operator?(node)
+          return false unless style == :fdiv
+
+          range = node.receiver.source_range.end.join(node.first_argument.source_range.begin)
+          comment_in_range?(range)
+        end
+
+        def comment_in_range?(range)
+          processed_source.each_comment_in_lines(range.line..range.last_line).any? do |comment|
+            range.contains?(comment.source_range)
+          end
+        end
+
+        def operands_losing_to_f(node)
+          case style
+          when :left_coerce, :single_coerce
+            [node.first_argument]
+          when :right_coerce
+            [node.receiver]
+          else
+            [node.receiver, node.first_argument]
+          end
         end
 
         def correct_from_slash_to_fdiv(corrector, receiver, argument)

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

@@ -52,12 +52,23 @@ module RuboCop
         EACH_LENGTH = 'each'.length
         PREFER_EACH = 'Prefer `each` over `for`.'
         PREFER_FOR = 'Prefer `for` over `each`.'
+        IMPLICIT_PARAMETERS = %i[_1 _2 _3 _4 _5 _6 _7 _8 _9 it].to_set.freeze
+
+        # `Style/RedundantBegin` removes the `begin` of a block body in the same pass,
+        # leaving a `rescue` or `ensure` clause directly in the `for` body.
+        # `Style/ItBlockParameter` replaces block parameter references in the body
+        # with `it` in the same pass, while they become `for` loop variables.
+        def self.autocorrect_incompatible_with
+          [Style::RedundantBegin, Style::ItBlockParameter]
+        end
 
         def on_for(node)
           if style == :each
             add_offense(node, message: PREFER_EACH) do |corrector|
-              ForToEachCorrector.new(node).call(corrector)
               opposite_style_detected
+              next unless convertible_to_each?(node)
+
+              ForToEachCorrector.new(node).call(corrector)
             end
           else
             correct_style_detected
@@ -69,7 +80,8 @@ module RuboCop
 
           if style == :for
             return unless node.receiver
-            return if rescue_or_ensure_body?(node)
+            return unless convertible_to_for?(node)
+            return if rescue_or_ensure_body?(node) || do_end_block_in_collection?(node)
 
             add_offense(node, message: PREFER_FOR) do |corrector|
               EachToForCorrector.new(node).call(corrector)
@@ -85,13 +97,52 @@ module RuboCop
 
         private
 
+        # The loop variable becomes a block parameter, which can only be a local
+        # variable, and the body can't refer to an implicit block parameter
+        # (`_1` or `it`) once the block has an explicit one.
+        def convertible_to_each?(node)
+          return false unless node.variable.each_node.all? { |n| n.type?(:lvasgn, :mlhs, :splat) }
+          return true unless node.body
+
+          node.body.each_node(:send, :lvar).none? { |ref| implicit_parameter?(ref, node) }
+        end
+
+        # Inside a numbered or `it` block, `_1` and `it` are local variables
+        # rather than method calls.
+        def implicit_parameter?(ref, for_node)
+          return false unless implicit_parameter_reference?(ref)
+
+          ref.each_ancestor.take_while { |ancestor| !ancestor.equal?(for_node) }
+             .none?(&:any_block_type?)
+        end
+
+        def implicit_parameter_reference?(ref)
+          return IMPLICIT_PARAMETERS.include?(ref.name) if ref.lvar_type?
+
+          IMPLICIT_PARAMETERS.include?(ref.method_name) && !ref.receiver && !ref.arguments?
+        end
+
         def suspect_enumerable?(node)
           node.multiline? && node.method?(:each) && !node.send_node.arguments?
         end
 
+        def convertible_to_for?(node)
+          return false if node.type?(:numblock, :itblock)
+          return true unless node.arguments?
+
+          arguments = node.arguments
+          return false if arguments.children.one? && arguments.children.first.restarg_type?
+
+          arguments.each_descendant.all? { |arg| arg.type?(:arg, :restarg, :mlhs) }
+        end
+
         def rescue_or_ensure_body?(node)
           node.body&.type?(:rescue, :ensure)
         end
+
+        def do_end_block_in_collection?(node)
+          node.receiver.each_node(:any_block).any?(&:keywords?)
+        end
       end
     end
   end