f

Author: mbj

lib/unparser/buffer.rb

@@ -77,6 +77,10 @@ def unindent
       self
     end
 
+    def ensure_nl
+      nl unless fresh_line?
+    end
+
     # Write newline
     #
     # @return [self]
@@ -95,6 +99,16 @@ def final_newline
       write(NL) unless @lines.zero?
     end
 
+    def nl_flush_heredocs
+      return if @heredocs.empty?
+
+      if fresh_line?
+        flush_heredocs
+      else
+        nl
+      end
+    end
+
     def flush_heredocs
       @heredocs.each(&method(:write))
       @heredocs = []

lib/unparser/generation.rb

@@ -149,7 +149,7 @@ def emit_body_inner(node)
       emit_body_member(head)
 
       tail.each do |child|
-        nl
+        buffer.ensure_nl
 
         nl if EXTRA_NL.include?(child.type)
 

lib/unparser/writer.rb

@@ -35,8 +35,6 @@ def round_trips?(source:)
       buffer.write_encoding(explicit_encoding) if explicit_encoding
       buffer.write(source)
 
-      puts "Candidate source:\n#{buffer.content}"
-
       node.eql?(parser.parse(Unparser.buffer(buffer.content)))
     rescue Parser::SyntaxError
       false

lib/unparser/writer/dynamic_string.rb

@@ -12,6 +12,7 @@ class DynamicString
       HEREDOC_THRESHOLD = 8
       HEREDOC_DELIMITER = 'HEREDOC'
       HEREDOC_HEADER    = "<<-#{HEREDOC_DELIMITER}"
+      HEREDOC_FOOTER    = "#{HEREDOC_DELIMITER}\n"
 
       private_constant(*constants(false))
 
@@ -115,16 +116,11 @@ class Heredoc
 
         def emit
           emit_heredoc_body
-          emit_heredoc_footer
-          nl
+          write(HEREDOC_FOOTER)
         end
 
       private
 
-        def emit_heredoc_footer
-          write(HEREDOC_DELIMITER)
-        end
-
         def emit_heredoc_body
           buffer.root_indent do
             children.each do |child|

lib/unparser/writer/regexp.rb

@@ -41,6 +41,7 @@ def dispatch
             body.each(&method(:emit_body))
             write(token_close)
             emit_options
+            buffer.nl_flush_heredocs
           end
         end
 
@@ -87,7 +88,6 @@ def render_with_delimiter(token_close:, token_open:)
         )
 
         writer.dispatch
-        buffer.flush_heredocs
         buffer.content.freeze
       end
     end # Regexp

spec/unit/unparser/buffer_spec.rb

@@ -166,4 +166,46 @@
 
     it_should_behave_like 'a command method'
   end
+
+  describe '#nl_flush_heredocs' do
+    let(:object) { described_class.new }
+
+    subject { object.nl_flush_heredocs }
+
+    context 'on unbuffered heredoc' do
+      context 'on fresh line' do
+        it 'does nothing' do
+          subject
+          expect(object.content).to eql('')
+        end
+      end
+
+      context 'outside fresh line' do
+        it 'does nothing' do
+          object.write('foo')
+          subject
+          expect(object.content).to eql('foo')
+        end
+      end
+    end
+
+    context 'on buffered heredocs' do
+      context 'on fresh line' do
+        it 'flushes heredoc' do
+          object.push_heredoc('HEREDOC')
+          subject
+          expect(object.content).to eql('HEREDOC')
+        end
+      end
+
+      context 'outside fresh line' do
+        it 'flushes heredoc, with new line' do
+          object.write('foo')
+          object.push_heredoc('HEREDOC')
+          subject
+          expect(object.content).to eql("foo\nHEREDOC")
+        end
+      end
+    end
+  end
 end