Merge pull request #343 from ruby-formatter/fix-342

Fix #342

Author: kzkn

lib/rufo/formatter.rb

@@ -252,22 +252,22 @@ def visit(node)
         next_token
       else
         # For heredocs with tilde we sometimes need to align the contents
-        if heredoc && tilde && @last_was_newline
-          unless (current_token_value == "\n" ||
-                  current_token_kind == :on_heredoc_end)
-            write_indent(next_indent)
-          end
-          skip_ignored_space
-          if current_token_kind == :on_tstring_content
-            check :on_tstring_content
-            consume_token_value(current_token_value)
-            next_token
+        if heredoc && tilde
+          while (current_token_kind == :on_ignored_sp) ||
+                (current_token_kind == :on_tstring_content)
+            if @last_was_newline && current_token_value != "\n"
+              write_indent(next_indent)
+              @last_was_newline = false
+            end
+            if current_token_kind == :on_ignored_sp
+              skip_ignored_space
+            else
+              consume_token current_token_kind
+            end
           end
         else
           while (current_token_kind == :on_ignored_sp) ||
-                (current_token_kind == :on_tstring_content) ||
-                (current_token_kind == :on_embexpr_beg)
-            check current_token_kind
+                (current_token_kind == :on_tstring_content)
             break if current_token_kind == :on_embexpr_beg
             consume_token current_token_kind
           end

spec/lib/rufo/formatter_source_specs/squiggly_heredoc.rb.spec

@@ -273,3 +273,16 @@ EOF
     heredoc
   EOF
 }
+
+#~# ORIGINAL issue_342
+
+foox <<~TEXT
+  #{x}x
+  a
+TEXT
+
+#~# EXPECTED
+foox <<~TEXT
+       #{x}x
+       a
+     TEXT