[Fix rubocop#10403] Fix an error for Style/StringConcatenation

Fixes rubocop#10403. This PR fixes an error for `Style/StringConcatenation` when string concatenation with multiline heredoc text.
koic · Feb 8, 2022 · 11dde02 · 11dde02
1 parent af609e5
commit 11dde02
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/changelog/fix_an_error_for_style_string_concatenation.md b/changelog/fix_an_error_for_style_string_concatenation.md
@@ -0,0 +1 @@
+* [#10403](https://github.com/rubocop/rubocop/issues/10403): Fix an error for `Style/StringConcatenation` when string concatenation with multiline heredoc text. ([@koic][])
diff --git a/lib/rubocop/cop/style/string_concatenation.rb b/lib/rubocop/cop/style/string_concatenation.rb
@@ -134,7 +134,13 @@ def plus_node?(node)
         end
 
         def uncorrectable?(part)
-          part.multiline? || (part.str_type? && part.heredoc?) || part.each_descendant(:block).any?
+          part.multiline? || heredoc?(part) || part.each_descendant(:block).any?
+        end
+
+        def heredoc?(node)
+          return false unless node.str_type? || node.dstr_type?
+
+          node.heredoc?
         end
 
         def corrected_ancestor?(node)

diff --git a/spec/rubocop/cop/style/string_concatenation_spec.rb b/spec/rubocop/cop/style/string_concatenation_spec.rb
@@ -143,6 +143,18 @@
 
       expect_no_corrections
     end
+
+    it 'registers an offense but does not correct when string concatenation with multiline heredoc text' do
+      expect_offense(<<~RUBY)
+        "foo" + <<~TEXT
+        ^^^^^^^^^^^^^^^ Prefer string interpolation to string concatenation.
+          bar
+          baz
+        TEXT
+      RUBY
+
+      expect_no_corrections
+    end
   end
 
   context 'double quotes inside string' do