syntax_tree-haml 3.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93531550f281631f3aa86988c3309f3a48250bd6e218c3712013bbcc1a590480
-  data.tar.gz: f8cf31bae239650f86a13dd8d0bdda41c5eab011bbd1ae829656df387b22b1bf
+  metadata.gz: '081e23c9f9f103fd51db64973ec590cb21e1f4e34b31dc6769e70d2e7ec83db8'
+  data.tar.gz: 900420a1918e007b906c3bf94d9d8639bc379acd82f29b1cdd307c2ca21688a7
 SHA512:
-  metadata.gz: caac6d625f266b6ac4d5808065573f2ae70de84ad3670cbed2c1cea8089e75e1f8986e5391f0349975ff0d1cb32a65aa114e3d3578207be46b8637358162f06a
-  data.tar.gz: fc8b9c900b04d1a6536ac7d7299d66be150111d11989f855e5bfd17820939fefca789f09fd8c830e761721a3ffc396c2a54865792e9c242e66de498efe5aef8d
+  metadata.gz: 991fb1d1aedd65e2bcea53b89cc710dd3734109770bf03dc79070437129397cfbaa4b7a400c4584881e41a52db46bf0254cd84d3499ff1b4a3b3763ef29cb32e
+  data.tar.gz: b48967b39546927871d86c485210ba6ccf007ae608bd3cdbacc8962658c1648d56e3ac76074e73042962142b799f0785b4719f8b680abbc972088e2eea622327

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.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
+
+- Required syntax_tree version 6.0.0 or higher.
+- Fixed up hash attribute parser to handle multiline hashes using Syntax Tree itself.
+
 ## [3.0.0] - 2022-12-23
 
 ### Changed
@@ -79,7 +93,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/v3.0.0...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.1...HEAD
+[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,10 +1,10 @@
 PATH
   remote: .
   specs:
-    syntax_tree-haml (3.0.0)
-      haml (>= 5.2, != 6.0.0)
+    syntax_tree-haml (4.0.1)
+      haml (>= 5.2)
       prettier_print (>= 1.0.0)
-      syntax_tree (>= 5.0.1)
+      syntax_tree (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -14,26 +14,23 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    minitest (5.16.3)
-    prettier_print (1.1.0)
+    minitest (5.18.0)
+    prettier_print (1.2.0)
     rake (13.0.6)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (5.0.1)
-      prettier_print (>= 1.1.0)
-    temple (0.9.1)
+    syntax_tree (6.0.2)
+      prettier_print (>= 1.2.0)
+    temple (0.10.0)
     thor (1.2.1)
-    tilt (2.0.11)
+    tilt (2.1.0)
 
 PLATFORMS
-  ruby
-  x86_64-darwin-19
-  x86_64-darwin-20
-  x86_64-darwin-21
+  arm64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -44,4 +41,4 @@ DEPENDENCIES
   syntax_tree-haml!
 
 BUNDLED WITH
-   2.3.6
+   2.4.1

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
@@ -161,7 +167,6 @@ module SyntaxTree
       end
 
       LiteralHashValue = Struct.new(:value)
-      StringHashValue = Struct.new(:value, :quote)
 
       # When formatting a tag, there are a lot of different kinds of things that
       # can be printed out. There's the tag name, the attributes, the content,
@@ -274,7 +279,7 @@ module SyntaxTree
               q.group do
                 level == 0 ? q.breakable_empty : q.breakable_space
                 q.seplist(hash, nil, :each_pair) do |key, value|
-                  if key.match?(/^@|[-:]/)
+                  if key.match?(/^@|[-:]/) && !key.match?(/^["']/)
                     q.text("#{quote}#{Quotes.normalize(key, quote)}#{quote}:")
                   else
                     q.text("#{key}:")
@@ -352,17 +357,7 @@ module SyntaxTree
         # we're going to print them out here.
         if node.value[:dynamic_attributes].old
           parts << PlainPart.new("%div") if parts.empty?
-
-          if ::Haml::AttributeParser.available?
-            dynamic = parse_attributes(node.value[:dynamic_attributes].old)
-            parts << if dynamic.is_a?(LiteralHashValue)
-              PlainPart.new(dynamic.value)
-            else
-              HashAttributesPart.new(dynamic)
-            end
-          else
-            parts << PlainPart.new(node.value[:dynamic_attributes].old)
-          end
+          parts << parse_attributes(node.value[:dynamic_attributes].old)
         end
 
         # https://haml.info/docs/yardoc/file.REFERENCE.html#object-reference-
@@ -388,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)
@@ -410,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.
@@ -438,18 +451,52 @@ module SyntaxTree
       # Take a source string and attempt to parse it into a set of attributes
       # that can be used to format the source.
       def parse_attributes(source)
-        program = Ripper.sexp(source)
-        type = program && program[1][0][0]
+        source = source.strip
+        source = source.start_with?("{") ? source : "{#{source}}"
 
-        if type == :hash && (parsed = ::Haml::AttributeParser.parse(source))
-          parsed.to_h { |key, value| [key, parse_attributes(value)] }
-        elsif type == :string_literal
-          SyntaxTree.parse(source).statements.body[0]
-        else
-          LiteralHashValue.new(source)
+        program = SyntaxTree.parse(source)
+        return PlainPart.new(source) if program.nil?
+
+        node = program.statements.body.first
+        return PlainPart.new(source) unless node.is_a?(HashLiteral)
+
+        HashAttributesPart.new(parse_attributes_hash(source, node))
+      rescue Parser::ParseError
+        PlainPart.new(source)
+      end
+
+      def parse_attributes_hash(source, node, level = 1)
+        node.assocs.to_h do |assoc|
+          key =
+            case assoc.key
+            when StringLiteral
+              format(assoc.key)
+            when Label
+              assoc.key.value.delete_suffix(":")
+            when DynaSymbol
+              format(assoc.key).delete_prefix(":")
+            else
+              format(assoc.key)
+            end
+
+          value =
+            case assoc.value
+            when HashLiteral
+              parse_attributes_hash(source, assoc.value, level + 1)
+            when StringLiteral
+              assoc.value
+            else
+              LiteralHashValue.new(format(assoc.value, level * 2).lstrip)
+            end
+
+          [key, value]
         end
       end
 
+      def format(node, column = 0)
+        SyntaxTree::Formatter.format(+"", node, column)
+      end
+
       def with_children(node)
         if node.children.empty?
           q.group { yield }

data/lib/syntax_tree/haml/version.rb

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

data/syntax_tree-haml.gemspec

@@ -24,10 +24,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  # Can't use 6.0.0 due to https://github.com/haml/haml/issues/1085
-  spec.add_dependency "haml", ">= 5.2", "!= 6.0.0"
+  spec.add_dependency "haml", ">= 5.2"
   spec.add_dependency "prettier_print", ">= 1.0.0"
-  spec.add_dependency "syntax_tree", ">= 5.0.1"
+  spec.add_dependency "syntax_tree", ">= 6.0.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree-haml
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: prettier_print
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Syntax Tree support for Haml