Merge pull request #733 from kazarin/fix_incorrect_autocorrect_for_ra…

…ils_strip_heredoc [Fix #731] Fix an incorrect autocorrect for Rails/StripHeredoc
rubocop · Jun 28, 2022 · 0c18551 · 0c18551
2 parents da37010 + c26b36c
commit 0c18551
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/changelog/fix_fix_an_incorrect_autocorrect_for_strip_heredoc.md b/changelog/fix_fix_an_incorrect_autocorrect_for_strip_heredoc.md
@@ -0,0 +1 @@
+* [#731](https://github.com/rubocop/rubocop-rails/issues/731): Fix an incorrect autocorrect for `Rails/StripHeredoc`. ([@kazarin][])
diff --git a/lib/rubocop/cop/rails/strip_heredoc.rb b/lib/rubocop/cop/rails/strip_heredoc.rb
@@ -43,7 +43,7 @@ def on_send(node)
 
         def register_offense(node, heredoc)
           add_offense(node) do |corrector|
-            squiggly_heredoc = heredoc.source.sub(/\A<<-?/, '<<~')
+            squiggly_heredoc = heredoc.source.sub(/\A<<(-|~)?/, '<<~')
 
             corrector.replace(heredoc, squiggly_heredoc)
             corrector.remove(node.loc.dot)

diff --git a/spec/rubocop/cop/rails/strip_heredoc_spec.rb b/spec/rubocop/cop/rails/strip_heredoc_spec.rb
@@ -74,6 +74,21 @@
       RUBY
     end
 
+    it 'registers an offense when squiggly already present' do
+      expect_offense(<<~RUBY)
+        <<~EOS.strip_heredoc
+        ^^^^^^^^^^^^^^^^^^^^ Use squiggly heredoc (`<<~`) instead of `strip_heredoc`.
+          some text
+        EOS
+      RUBY
+
+      expect_correction(<<~RUBY)
+        <<~EOS
+          some text
+        EOS
+      RUBY
+    end
+
     it 'does not register an offense when using squiggly heredoc' do
       expect_no_offenses(<<~RUBY)
         <<~EOS
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* [#731](https://github.com/rubocop/rubocop-rails/issues/731): Fix an incorrect autocorrect for `Rails/StripHeredoc`. ([@kazarin][])