syntax_tree-haml 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090ea651f3d163420a8d52ec028c152238f2184770d1a1de3771391e37804550'
-  data.tar.gz: b9b1241849203a2b0ded757e135319d3f05c200cc6add2ca42991de03de28f7c
+  metadata.gz: b926fc681f1792de33a0ab58885860f06337de292164185fd9d0cf86ff80da90
+  data.tar.gz: a09512989ef9b799975ec639ddbaa5fc65bddd76b0cdc9719b309372a5a4cb71
 SHA512:
-  metadata.gz: 9ce10d5f934ab991630d7893a4439a829db161a796f54fa560407e07ab513046dd495cf8b84cd91c3aa59acb68543e0a5b6f622c18c48aa9c9aa2c54ce30378a
-  data.tar.gz: 6c706e13ce097c7dbf3484701cb88cb6007683dc825f0a4a0b9666fd0fc0bf0dee5fa1b92ba4e63528d118480a0e66df5aa363a9bb0607c5e08ec8b638e0694b
+  metadata.gz: a07aea76babd7c8a4c765749b3107c0dd3a904ced2550ddb15ea85cfaa6d3df12f6d20767c855eede216d54fdf844e41b00efcf186b9b44409510236823d58ae
+  data.tar.gz: 108994617aba53d1eb5758d563c3a5b96f65551ec7a0af9e66862f9c8e26c77232f4eb3bc727d9711f7da78f32d91d91adff3a0152ea6b35d7098a5c14d4fabd

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,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [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
+
+- We now keep blank lines around in the source template. (Multiple blank lines are squished down to a single blank line.)
+- We now actually parse the Ruby code written in `%=` tags. This fixed a couple of bugs and allows us to better format the output. For example, `%p= 1+1` will now be formatted as `%p= 1 + 1`. If the output fails to parse it falls back to the previous behavior of just printing the Ruby code as-is.
+
 ## [4.0.0] - 2023-03-07
 
 ### Changed
@@ -86,7 +100,10 @@ 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/v3.0.0...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.2...HEAD
+[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
 [2.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.2...v2.0.0
 [1.3.2]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.1...v1.3.2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    syntax_tree-haml (4.0.0)
+    syntax_tree-haml (4.0.2)
       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)
@@ -31,6 +31,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   bundler

data/lib/syntax_tree/haml/format.rb

@@ -120,7 +120,13 @@ module SyntaxTree
 
       # Visit the root node of the AST.
       def visit_root(node)
+        previous_line = nil
+
         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
+
           visit(child)
           q.breakable_force
         end
@@ -377,15 +383,8 @@ module SyntaxTree
               # tag.
               q.breakable_empty
 
-              if node.value[:parse] && value.match?(/#[{$@]/)
-                # There's a weird case here where if the value includes
-                # interpolation and it's marked as { parse: true }, then we
-                # don't actually want the = prefix, and we want to remove extra
-                # escaping.
-                q.if_break { q.text("") }.if_flat { q.text(" ") }
-                q.text(value[1...-1].gsub(/\\"/, "\""))
-              elsif node.value[:parse]
-                q.text("= #{value}")
+              if node.value[:parse]
+                format_tag_value(q, value)
               else
                 q.if_break { q.text("") }.if_flat { q.text(" ") }
                 q.text(value)
@@ -399,6 +398,31 @@ module SyntaxTree
 
       private
 
+      def format_tag_value(q, value)
+        program = SyntaxTree.parse(value)
+        if !program || program.statements.body.length > 1
+          return q.text("= #{value}")
+        end
+
+        statement = program.statements.body.first
+        formatter = SyntaxTree::Formatter.new(value, [], Float::INFINITY)
+        formatter.format(statement)
+        formatter.flush
+        formatted = formatter.output.join
+
+        if statement.is_a?(StringLiteral) && statement.parts.length > 1
+          # There's a weird case here where if the value includes interpolation
+          # and it's marked as { parse: true }, then we don't actually want the
+          # = prefix, and we want to remove extra escaping.
+          q.if_break { q.text("") }.if_flat { q.text(" ") }
+          q.text(formatted[1...-1].gsub(/\\"/, "\""))
+        else
+          q.text("= #{formatted}")
+        end
+      rescue Parser::ParseError
+        q.text("= #{value}")
+      end
+
       # When printing out sequences of silent scripts, sometimes subsequent nodes
       # will be continuations of previous nodes. In that case we want to dedent
       # them to match.
@@ -480,8 +504,18 @@ 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
+
+                previous_line =
+                  child.children.any? ? child.children.last.line : child.line
+
                 visit(child)
               end
             end

data/lib/syntax_tree/haml/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module Haml
-    VERSION = "4.0.0"
+    VERSION = "4.0.2"
   end
 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.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-09 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