rubocop 1.91.0 → 1.92.2

data/lib/rubocop/cop/layout/first_argument_indentation.rb

@@ -152,6 +152,10 @@ module RuboCop
 
         MSG = 'Indent the first argument one step more than %<base>s.'
 
+        def self.autocorrect_incompatible_with
+          [Layout::ArgumentAlignment, Layout::HashAlignment]
+        end
+
         def on_send(node)
           return unless should_check?(node)
           return if same_line?(node, node.first_argument)
@@ -180,7 +184,13 @@ module RuboCop
 
           top_level_send = find_top_level_send(send_node)
           node_to_correct =
-            should_correct_entire_chain?(send_node, top_level_send) ? top_level_send : node
+            if should_correct_entire_chain?(send_node, top_level_send)
+              top_level_send
+            elsif hash_elements_aligned_by_argument_alignment?(node)
+              node.children.first
+            else
+              node
+            end
 
           AlignmentCorrector.correct(corrector, processed_source, node_to_correct, column_delta)
         end
@@ -189,6 +199,7 @@ module RuboCop
           return false unless style == :special_for_inner_method_call_in_parentheses
           return false unless inner_call?(top_level_send)
           return false unless display_column(send_node.source_range) < column_delta.abs
+          return false if column_delta.positive?
 
           top_level_send != send_node || begins_its_line?(top_level_send.loc.end)
         end
@@ -209,6 +220,21 @@ module RuboCop
           top_level_send
         end
 
+        # `Layout/ArgumentAlignment` with `with_fixed_indentation` indents the pairs of an
+        # unbraced hash to a fixed column, so they must not move along with the first element.
+        def hash_elements_aligned_by_argument_alignment?(node)
+          return false if !node.hash_type? || node.braces?
+          return false unless enforce_first_argument_with_fixed_indentation?
+
+          argument_alignment_applies?(node.parent) && !enforce_hash_argument_with_separator?
+        end
+
+        def enforce_hash_argument_with_separator?
+          HashAlignment::SEPARATOR_ALIGNMENT_STYLES.any? do |style|
+            config.for_enabled_cop('Layout/HashAlignment')[style]&.include?('separator')
+          end
+        end
+
         def bare_operator?(node)
           node.operator_method? && !node.dot?
         end

data/lib/rubocop/cop/layout/first_array_element_line_break.rb

@@ -6,6 +6,10 @@ module RuboCop
       # Checks for a line break before the first element in a
       # multi-line array.
       #
+      # NOTE: An array whose first element is an array literal is not checked when
+      # `Layout/SpaceInsideArrayLiteralBrackets` is enabled with `EnforcedStyle: compact`,
+      # since that style joins the two opening brackets.
+      #
       # @example
       #
       #   # bad
@@ -70,6 +74,7 @@ module RuboCop
         def on_array(node)
           return if !node.loc.begin && !assignment_on_same_line?(node)
           return if allow_implicit_array_brackets? && !node.bracketed?
+          return if compact_nested_array?(node)
 
           check_children_line_break(node, node.children, ignore_last: ignore_last_element?)
         end
@@ -85,6 +90,16 @@ module RuboCop
           !!cop_config['AllowImplicitArrayLiterals']
         end
 
+        def compact_nested_array?(node)
+          node.square_brackets? && node.children.first&.source&.start_with?('[') &&
+            compact_array_brackets_enforced?
+        end
+
+        def compact_array_brackets_enforced?
+          config.cop_enabled?('Layout/SpaceInsideArrayLiteralBrackets') &&
+            config.for_cop('Layout/SpaceInsideArrayLiteralBrackets')['EnforcedStyle'] == 'compact'
+        end
+
         def ignore_last_element?
           !!cop_config['AllowMultilineFinalElement']
         end

data/lib/rubocop/cop/layout/first_hash_element_indentation.rb

@@ -156,16 +156,22 @@ module RuboCop
           if first_pair
             return if same_line?(first_pair, left_brace)
 
-            if separator_style?(first_pair)
-              check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
-            else
-              check_first(first_pair, left_brace, left_parenthesis, 0)
-            end
+            check_first_pair(hash_node, first_pair, left_brace, left_parenthesis)
           end
 
           check_right_brace(hash_node.loc.end, first_pair, left_brace, left_parenthesis)
         end
 
+        def check_first_pair(hash_node, first_pair, left_brace, left_parenthesis)
+          return unless begins_its_line?(first_pair.source_range)
+
+          if separator_style?(first_pair)
+            check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
+          else
+            check_first(first_pair, left_brace, left_parenthesis, 0)
+          end
+        end
+
         def check_right_brace(right_brace, first_pair, left_brace, left_parenthesis)
           # if the right brace is on the same line as the last value, accept
           return if /\S/.match?(right_brace.source_line[0...right_brace.column])
@@ -187,9 +193,11 @@ module RuboCop
         end
 
         def check_based_on_longest_key(hash_node, left_brace, left_parenthesis)
-          key_lengths = hash_node.keys.map { |key| key.source_range.length }
-          check_first(hash_node.pairs.first, left_brace, left_parenthesis,
-                      key_lengths.max - key_lengths.first)
+          first_key = hash_node.keys.first
+          key_lengths = hash_node.keys.select(&:single_line?).map { |key| key.source_range.length }
+          offset = first_key.single_line? ? key_lengths.max - first_key.source_range.length : 0
+
+          check_first(hash_node.pairs.first, left_brace, left_parenthesis, offset)
         end
 
         # Returns the description of what the correct indentation is based on.

data/lib/rubocop/cop/layout/first_method_argument_line_break.rb

@@ -75,6 +75,12 @@ module RuboCop
 
         MSG = 'Add a line break before the first argument of a multi-line method argument list.'
 
+        # A line break inserted after `(` while `Style/MethodCallWithArgsParentheses` removes
+        # the parentheses in the same pass leaves the method name alone on its line.
+        def self.autocorrect_incompatible_with
+          [Style::MethodCallWithArgsParentheses]
+        end
+
         def on_send(node)
           return if allowed_method?(node.method_name)
 

data/lib/rubocop/cop/layout/first_method_parameter_line_break.rb

@@ -59,6 +59,10 @@ module RuboCop
 
         MSG = 'Add a line break before the first parameter of a multi-line method parameter list.'
 
+        def self.autocorrect_incompatible_with
+          [Style::MethodDefParentheses]
+        end
+
         def on_def(node)
           check_method_line_break(node, node.arguments, ignore_last: ignore_last_element?)
         end

data/lib/rubocop/cop/layout/hash_alignment.rb

@@ -215,7 +215,7 @@ module RuboCop
           check_pairs(node)
         end
 
-        attr_accessor :offenses_by, :column_deltas
+        attr_accessor :offenses_by, :column_deltas, :unalignable_styles
 
         private
 
@@ -240,6 +240,7 @@ module RuboCop
         def reset!
           self.offenses_by = {}
           self.column_deltas = Hash.new { |hash, key| hash[key] = {} }
+          self.unalignable_styles = []
         end
 
         def check_pairs(node)
@@ -265,7 +266,9 @@ module RuboCop
           kwsplat_offenses = offenses_by.delete(KeywordSplatAlignment)
           register_offenses_with_format(kwsplat_offenses, KeywordSplatAlignment)
 
-          format, offenses = offenses_by.min_by { |_, v| v.length }
+          candidates = offenses_by.reject { |style, _| unalignable_styles.include?(style) }
+          candidates = offenses_by if candidates.empty?
+          format, offenses = candidates.min_by { |_, v| v.length }
           register_offenses_with_format(offenses, format)
         end
 
@@ -283,10 +286,19 @@ module RuboCop
           offenses_by[alignment.class] ||= []
           return if good_alignment? delta
 
+          if key_out_of_line?(delta, node)
+            unalignable_styles << alignment.class
+            return
+          end
+
           column_deltas[alignment.class][node] = delta
           offenses_by[alignment.class].push(node)
         end
 
+        def key_out_of_line?(delta, node)
+          (delta[:key] || 0) < -node.source_range.column
+        end
+
         def ignore_hash_argument?(node)
           case cop_config['EnforcedLastArgumentHashStyle']
           when 'always_inspect'  then false
@@ -325,18 +337,10 @@ module RuboCop
                               node.loc.operator)
           else
             delta_value = delta[:key] || 0
-            correct_no_value(corrector, delta_value, node.source_range)
+            adjust(corrector, delta_value, node.source_range)
           end
         end
 
-        def correct_no_value(corrector, key_delta, key)
-          adjust(corrector, clamped_key_delta(key_delta, key), key)
-        end
-
-        def clamped_key_delta(key_delta, key)
-          [key_delta, -key.column].max
-        end
-
         def correct_key_value(corrector, delta, key, value, separator)
           # We can't use the instance variable inside the lambda. That would
           # just give each lambda the same reference and they would all get the
@@ -345,7 +349,7 @@ module RuboCop
           value_delta     = delta[:value]     || 0
           key_delta       = delta[:key]       || 0
 
-          adjust(corrector, clamped_key_delta(key_delta, key), key)
+          adjust(corrector, key_delta, key)
           adjust(corrector, separator_delta, separator)
           adjust(corrector, value_delta, value)
         end

data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb

@@ -57,8 +57,10 @@ module RuboCop
         MSG = 'Put the closing parenthesis for a method call with a ' \
               'HEREDOC parameter on the same line as the HEREDOC opening.'
 
+        # `Layout/MultilineMethodCallBraceLayout` can move the same closing parenthesis after
+        # the last argument in the same pass, and both insertions are kept.
         def self.autocorrect_incompatible_with
-          [Style::TrailingCommaInArguments]
+          [Layout::MultilineMethodCallBraceLayout, Style::TrailingCommaInArguments]
         end
 
         def on_send(node)
@@ -117,6 +119,8 @@ module RuboCop
           previous = heredoc
           current = previous.parent
           until send_missing_closing_parens?(current, previous, heredoc)
+            return if current&.any_block_type? && !current.send_node.equal?(previous)
+
             previous = current
             current = current.parent
             return unless previous && current
@@ -229,8 +233,8 @@ module RuboCop
         end
 
         def find_most_bottom_of_heredoc_end(arguments)
-          arguments.filter_map do |argument|
-            argument.loc.heredoc_end.end_pos if argument.loc?(:heredoc_end)
+          arguments.flat_map { |argument| argument.each_node(:any_str).to_a }.filter_map do |node|
+            node.loc.heredoc_end.end_pos if node.loc?(:heredoc_end)
           end.max
         end
 

data/lib/rubocop/cop/layout/heredoc_indentation.rb

@@ -55,6 +55,10 @@ module RuboCop
           (send _ {:squish :squish!})
         PATTERN
 
+        def on_new_investigation
+          @offending_heredoc_bodies = nil
+        end
+
         def on_heredoc(node)
           body = heredoc_body(node)
           return if body.strip.empty?
@@ -77,6 +81,9 @@ module RuboCop
         private
 
         def register_offense(node, heredoc_indent_type)
+          return if within_offending_heredoc?(node)
+
+          offending_heredoc_bodies << node.loc.heredoc_body
           message = message(heredoc_indent_type)
 
           add_offense(node.loc.heredoc_body, message: message) do |corrector|
@@ -90,6 +97,14 @@ module RuboCop
           end
         end
 
+        def within_offending_heredoc?(node)
+          offending_heredoc_bodies.any? { |body| body.contains?(node.source_range) }
+        end
+
+        def offending_heredoc_bodies
+          @offending_heredoc_bodies ||= []
+        end
+
         def message(heredoc_indent_type)
           current_indent_type = "<<#{heredoc_indent_type}"
 

data/lib/rubocop/cop/layout/indentation_consistency.rb

@@ -178,10 +178,24 @@ module RuboCop
         end
 
         def check_normal_style(node)
-          check_alignment(
-            node.children.reject { |child| bare_access_modifier?(child) },
-            base_column_for_normal_style(node)
-          )
+          items = node.children.reject { |child| bare_access_modifier?(child) }
+
+          check_alignment(items, base_column_for_normal_style(node) || governed_base_column(items))
+        end
+
+        def governed_base_column(items)
+          return unless config.cop_enabled?('Layout/IndentationWidth')
+          return if items.empty? || indentation_width_enabled_at?(items.first)
+
+          governed_item = items.find { |item| indentation_width_enabled_at?(item) }
+
+          display_column(governed_item.source_range) if governed_item
+        end
+
+        def indentation_width_enabled_at?(node)
+          comment_config = processed_source.comment_config
+
+          comment_config.cop_enabled_at_line?('Layout/IndentationWidth', node.first_line)
         end
 
         def check_indented_internal_methods_style(node)
@@ -197,7 +211,10 @@ module RuboCop
               children_to_check.last << child
             end
           end
-          children_to_check.each { |group| check_alignment(group) }
+
+          children_to_check.each do |group|
+            check_alignment(group, governed_base_column(group))
+          end
         end
       end
     end

data/lib/rubocop/cop/layout/indentation_style.rb

@@ -6,6 +6,9 @@ module RuboCop
       # Checks that the indentation method is consistent.
       # Either tabs only or spaces only are used for indentation.
       #
+      # With `EnforcedStyle: tabs`, spaces that follow the indenting tabs are
+      # taken to be alignment rather than indentation, and are left alone.
+      #
       # @example EnforcedStyle: spaces (default)
       #   # bad
       #   # This example uses a tab to indent bar.
@@ -67,7 +70,7 @@ module RuboCop
           match = if style == :spaces
                     line.match(/\A\s*\t+/)
                   else
-                    line.match(/\A\s* +/)
+                    line.match(/\A +/)
                   end
           return unless match
 

data/lib/rubocop/cop/layout/indentation_width.rb

@@ -82,7 +82,7 @@ module RuboCop
 
         # @!method access_modifier?(node)
         def_node_matcher :access_modifier?, <<~PATTERN
-          [(send ...) access_modifier?]
+          [(send ...) bare_access_modifier?]
         PATTERN
 
         def on_rescue(node)
@@ -250,7 +250,7 @@ module RuboCop
 
         def check_members_for_normal_style(base, members)
           members.first.children.each do |member|
-            next if member.send_type? && member.access_modifier?
+            next if member.send_type? && member.bare_access_modifier?
 
             check_indentation(base, member)
           end

data/lib/rubocop/cop/layout/line_continuation_spacing.rb

@@ -111,6 +111,12 @@ module RuboCop
           comments.map(&:source_range)
         end
 
+        def output_record_separator_ranges(ast)
+          return [] if ast.nil?
+
+          ast.each_node(:gvar).select { |gvar| gvar.source == '$\\' }.map(&:source_range)
+        end
+
         def last_line(processed_source)
           last_token = processed_source.tokens.last
 
@@ -123,7 +129,8 @@ module RuboCop
 
         def ignored_ranges
           @ignored_ranges ||= ignored_literal_ranges(processed_source.ast) +
-                              comment_ranges(processed_source.comments)
+                              comment_ranges(processed_source.comments) +
+                              output_record_separator_ranges(processed_source.ast)
         end
 
         def ignored_parent?(node)

data/lib/rubocop/cop/layout/line_end_string_concatenation_indentation.rb

@@ -87,10 +87,10 @@ module RuboCop
           return if children.empty?
 
           if style == :aligned && !always_indented?(node)
-            check_aligned(children, 1)
+            check_aligned(children, 1, children[0].loc.column)
           else
             check_indented(children)
-            check_aligned(children, 2)
+            check_aligned(children, 2, indented_column(children))
           end
         end
 
@@ -110,21 +110,37 @@ module RuboCop
           PARENT_TYPES_FOR_INDENTED.include?(dstr_node.parent&.type)
         end
 
-        def check_aligned(children, start_index)
+        def check_aligned(children, start_index, target_column)
           base_column = children[start_index - 1].loc.column
-          children[start_index..].each do |child|
-            @column_delta = base_column - child.loc.column
-            add_offense_and_correction(child, MSG_ALIGN) if @column_delta != 0
-            base_column = child.loc.column
+          same_column_runs(children[start_index..]).each do |run|
+            column = run.first.loc.column
+            if column != base_column && column != target_column
+              register_misaligned_run(run, target_column - column)
+            end
+            base_column = column
+          end
+        end
+
+        def same_column_runs(parts)
+          parts.chunk_while { |a, b| a.loc.column == b.loc.column }
+        end
+
+        def register_misaligned_run(run, column_delta)
+          @column_delta = column_delta
+          add_offense(run.first, message: MSG_ALIGN) do |corrector|
+            run.each { |child| autocorrect(corrector, child) }
           end
         end
 
         def check_indented(children)
-          @column_delta = base_column(children[0]) + configured_indentation_width -
-                          children[1].loc.column
+          @column_delta = indented_column(children) - children[1].loc.column
           add_offense_and_correction(children[1], MSG_INDENT) if @column_delta != 0
         end
 
+        def indented_column(children)
+          base_column(children[0]) + configured_indentation_width
+        end
+
         def base_column(child)
           grandparent = child.parent.parent
           if grandparent&.pair_type?