syntax_tree-haml 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '081e23c9f9f103fd51db64973ec590cb21e1f4e34b31dc6769e70d2e7ec83db8'
-  data.tar.gz: 900420a1918e007b906c3bf94d9d8639bc379acd82f29b1cdd307c2ca21688a7
+  metadata.gz: c410fddce7b0b3de3dca5f4f0ff6f1f495f70897d1a07f956ceb3cedb8a3bc42
+  data.tar.gz: 6f4866aefe38f780411b65fa2671a9f9491aba0249884dc6c6f627d1a76f5520
 SHA512:
-  metadata.gz: 991fb1d1aedd65e2bcea53b89cc710dd3734109770bf03dc79070437129397cfbaa4b7a400c4584881e41a52db46bf0254cd84d3499ff1b4a3b3763ef29cb32e
-  data.tar.gz: b48967b39546927871d86c485210ba6ccf007ae608bd3cdbacc8962658c1648d56e3ac76074e73042962142b799f0785b4719f8b680abbc972088e2eea622327
+  metadata.gz: b79312706a5519a3d6933040c99f353ca344290d9c026d27ee2b6aa5b092ef8f03e735ae5e0de4b832bf7acbdceeceb844bdb9ca46ddd1b6aa9ea3f8c1d37cbc
+  data.tar.gz: e0993ba8112bb8149cbcaf972ba588e2b347431254bf0d3d0a63482657d18d5f70af4aa58f185b9d696d5c028bae55621cb483ad9800474242c2236be3043e98

data/.github/workflows/main.yml

@@ -1,9 +1,11 @@
 name: Main
+
 on:
   push:
     branches:
       - main
   pull_request: {}
+
 jobs:
   ci:
     strategy:
@@ -14,10 +16,9 @@ jobs:
         - '2.7.5'
         - '3.0'
         - '3.1'
+        - '3.2'
     name: CI
     runs-on: ubuntu-latest
-    env:
-      CI: true
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [4.0.3] - 2023-03-12
+
+### Changed
+
+- Fixed a bug where blank lines were being inserted into filter nodes accidentally.
+
+## [4.0.2] - 2023-03-09
+
+### Changed
+
+- Require `prettier_print` `1.2.1` or higher to fix the infinite loop bug.
+- Maintain blank lines in nested nodes.
+
 ## [4.0.1] - 2023-03-07
 
 ### Changed
@@ -93,7 +106,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.1...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.3...HEAD
+[4.0.3]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.2...v4.0.3
+[4.0.2]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.1...v4.0.2
 [4.0.1]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v3.0.0...v4.0.0
 [3.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v2.0.0...v3.0.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    syntax_tree-haml (4.0.1)
+    syntax_tree-haml (4.0.3)
       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)

data/lib/syntax_tree/haml/format.rb

@@ -69,15 +69,17 @@ module SyntaxTree
             q.breakable_force
             first = true
 
-            node.value[:text].each_line(chomp: true) do |line|
-              if first
-                first = false
-              else
-                q.breakable_force
-              end
+            node.value[:text]
+              .rstrip
+              .each_line(chomp: true) do |line|
+                if first
+                  first = false
+                else
+                  q.breakable_force
+                end
 
-              q.text(line)
-            end
+                q.text(line)
+              end
           end
         end
       end
@@ -124,8 +126,7 @@ module SyntaxTree
 
         node.children.each do |child|
           q.breakable_force if previous_line && (child.line - previous_line) > 1
-          previous_line =
-            child.children.any? ? child.children.last.line : child.line
+          previous_line = child.last_line
 
           visit(child)
           q.breakable_force
@@ -504,9 +505,17 @@ module SyntaxTree
           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
+
                 visit(child)
+                previous_line = child.last_line
               end
             end
           end

data/lib/syntax_tree/haml/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module Haml
-    VERSION = "4.0.1"
+    VERSION = "4.0.3"
   end
 end

data/lib/syntax_tree/haml.rb

@@ -82,10 +82,30 @@ class Haml::Parser::ParseNode
     end
   end
 
+  # This is our entrypoint for the formatter. We effectively delegate this to
+  # accepting the Format visitor.
   def format(q)
     accept(SyntaxTree::Haml::Format.new(q))
   end
 
+  # When we're formatting a list of children, we need to know the last line a
+  # node is on. This is because the next node in the list of children should be
+  # at most 1 blank line below the last line of the previous node. We cache this
+  # because at worst it requires walking the entire tree because filter nodes
+  # can take up multiple lines.
+  def last_line
+    @last_line ||=
+      if children.any?
+        children.last.last_line
+      elsif type == :filter
+        line + value[:text].rstrip.count("\n") + 1
+      else
+        line
+      end
+  end
+
+  # This is our entrypoint for the pretty printer. We effectively delegate this
+  # to accepting the PrettyPrint visitor.
   def pretty_print(q)
     accept(SyntaxTree::Haml::PrettyPrint.new(q))
   end

data/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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree-haml
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: syntax_tree
   requirement: !ruby/object:Gem::Requirement