Merge pull request #11707 from nobuyo/fix-disable-uncorrectable-multi…

…line [Fix #11706] Fix infinite loop when `--disable-uncorrectable` option and there is a multi-line percent array violates `Layout/LineLength`
rubocop · Mar 17, 2023 · 7dd56dd · 7dd56dd
2 parents 4346f8e + 9150b4a
commit 7dd56dd
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/changelog/fix_fix_infinite_loop_when_disable_uncorrectable.md b/changelog/fix_fix_infinite_loop_when_disable_uncorrectable.md
@@ -0,0 +1 @@
+* [#11706](https://github.com/rubocop/rubocop/issues/11706): Fix infinite loop when `--disable-uncorrectable` option and there is a multi-line percent array violates `Layout/LineLength`. ([@nobuyo][])
diff --git a/lib/rubocop/cop/autocorrect_logic.rb b/lib/rubocop/cop/autocorrect_logic.rb
@@ -82,7 +82,7 @@ def surrounding_percent_array(offense_range)
           node.array_type? && node.percent_literal?
         end
 
-        percent_array.map(&:source_range).find { |range| range.crossing?(offense_range) }
+        percent_array.map(&:source_range).find { |range| range.overlaps?(offense_range) }
       end
 
       def range_of_first_line(range)

diff --git a/spec/rubocop/cli/disable_uncorrectable_spec.rb b/spec/rubocop/cli/disable_uncorrectable_spec.rb
@@ -261,11 +261,14 @@ def our_function
       end
 
       context 'and the offense is inside a percent array' do
-        it 'adds before-and-after disable statement around the percent array' do
+        before do
           create_file('.rubocop.yml', <<~YAML)
             Layout/LineLength:
               Max: 30
           YAML
+        end
+
+        it 'adds before-and-after disable statement around the percent array' do
           create_file('example.rb', <<~RUBY)
             # frozen_string_literal: true
 
@@ -282,6 +285,28 @@ def our_function
             # rubocop:enable Layout/LineLength
           RUBY
         end
+
+        it 'adds before-and-after disable statement around the multi-line percent array' do
+          create_file('example.rb', <<~RUBY)
+            # frozen_string_literal: true
+
+            ARRAY = %i[
+              AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+              AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+            ].freeze
+          RUBY
+          expect(exit_code).to eq(0)
+          expect(File.read('example.rb')).to eq(<<~RUBY)
+            # frozen_string_literal: true
+
+            # rubocop:todo Layout/LineLength
+            ARRAY = %i[
+              AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+              AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+            ].freeze
+            # rubocop:enable Layout/LineLength
+          RUBY
+        end
       end
     end