Merge pull request #80 from ruby-syntax-tree/more-fixes

More fixes

Author: kddnewton

Diff for: Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     syntax_tree-haml (4.0.1)
       haml (>= 5.2)
-      prettier_print (>= 1.0.0)
+      prettier_print (>= 1.2.1)
       syntax_tree (>= 6.0.0)
 
 GEM
@@ -15,7 +15,7 @@ GEM
       thor
       tilt
     minitest (5.18.0)
-    prettier_print (1.2.0)
+    prettier_print (1.2.1)
     rake (13.0.6)
     simplecov (0.22.0)
       docile (~> 1.1)

Diff for: lib/syntax_tree/haml/format.rb

@@ -504,8 +504,18 @@ def with_children(node)
           q.group do
             q.group { yield }
             q.indent do
+              previous_line = nil
+
               node.children.each do |child|
                 q.breakable_force
+
+                if previous_line && (child.line - previous_line) > 1
+                  q.breakable_force
+                end
+
+                previous_line =
+                  child.children.any? ? child.children.last.line : child.line
+
                 visit(child)
               end
             end

Diff for: syntax_tree-haml.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "haml", ">= 5.2"
-  spec.add_dependency "prettier_print", ">= 1.0.0"
+  spec.add_dependency "prettier_print", ">= 1.2.1"
   spec.add_dependency "syntax_tree", ">= 6.0.0"
 
   spec.add_development_dependency "bundler"

Diff for: test/plain_test.rb

@@ -26,4 +26,13 @@ def test_keeps_blank_lines
       plain
     HAML
   end
+
+  def test_keeps_nested_blank_lines
+    assert_format(<<~HAML)
+      %div
+        plain
+
+        plain
+    HAML
+  end
 end