[Fix #14858] Fix an error in Layout/FirstArgumentIndentation

koic · bbatsov · commit 99422a0ee9ec · 2026-02-12T09:10:53.000+02:00
This PR fixes an infinite loop error in `Layout/FirstArgumentIndentation` when first arguments are over-indented in nested method calls. Fixes #14858.
diff --git a/changelog/fix_an_error_in_layout_first_argument_indentation.md b/changelog/fix_an_error_in_layout_first_argument_indentation.md
@@ -0,0 +1 @@
+* [#14858](https://github.com/rubocop/rubocop/issues/14858): Fix an infinite loop error in `Layout/FirstArgumentIndentation` when first arguments are over-indented in nested method calls. ([@koic][])
diff --git a/lib/rubocop/cop/layout/first_argument_indentation.rb b/lib/rubocop/cop/layout/first_argument_indentation.rb
@@ -187,6 +187,7 @@ def autocorrect(corrector, node)
         def should_correct_entire_chain?(send_node, top_level_send)
           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
 
           top_level_send != send_node || begins_its_line?(top_level_send.loc.end)
         end
diff --git a/spec/rubocop/cop/layout/first_argument_indentation_spec.rb b/spec/rubocop/cop/layout/first_argument_indentation_spec.rb
@@ -132,6 +132,50 @@
         RUBY
       end
 
+      it 'registers an offense and corrects over-indented first arguments in nested method calls' do
+        expect_offense(<<~RUBY)
+          foo
+            .bar(
+            baz(
+            ^^^^ Indent the first argument one step more than the start of the previous line.
+                qux
+                ^^^ Bad indentation of the first argument.
+              )
+            )
+        RUBY
+
+        expect_correction(<<~RUBY)
+          foo
+            .bar(
+              baz(
+                qux
+                )
+            )
+        RUBY
+      end
+
+      it 'registers an offense and corrects over-indented first arguments in nested method calls with hash arguments' do
+        expect_offense(<<~RUBY)
+          foo
+            .bar(
+            bar(
+            ^^^^ Indent the first argument one step more than the start of the previous line.
+                key: value
+                ^^^^^^^^^^ Bad indentation of the first argument.
+              )
+            )
+        RUBY
+
+        expect_correction(<<~RUBY)
+          foo
+            .bar(
+              bar(
+                key: value
+                )
+            )
+        RUBY
+      end
+
       context 'when using safe navigation operator' do
         it 'registers an offense and corrects an under-indented 1st argument' do
           expect_offense(<<~RUBY)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+* [#14858](https://github.com/rubocop/rubocop/issues/14858): Fix an infinite loop error in `Layout/FirstArgumentIndentation` when first arguments are over-indented in nested method calls. ([@koic][])