syntax_tree-haml 2.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fd378df6679c193bda86bdb1f1f78de949b0978c7ec02ec114e1d8fadcd3b5
-  data.tar.gz: 1011cad24c3f91ab3086c14b9dda49c6a0093d20c8d3af8fc86286e8dd8851ed
+  metadata.gz: '090ea651f3d163420a8d52ec028c152238f2184770d1a1de3771391e37804550'
+  data.tar.gz: b9b1241849203a2b0ded757e135319d3f05c200cc6add2ca42991de03de28f7c
 SHA512:
-  metadata.gz: 3cfb430120300e2fe6a593a7a47e8be22c09d160960b5a6f6d324e117827d752c648d6111c47d664a8d137cff584aa5fb856d93241c5f7edf2be2360e7e8f8c4
-  data.tar.gz: 4e4597ea20a6514cc10ff326db244616ebdd41f11d71095f76ca4aabfb1a1c355e76620e024223ff761e5f9f5bcd0eb868ca62323b2ba669a202da8c0ba13d55
+  metadata.gz: 9ce10d5f934ab991630d7893a4439a829db161a796f54fa560407e07ab513046dd495cf8b84cd91c3aa59acb68543e0a5b6f622c18c48aa9c9aa2c54ce30378a
+  data.tar.gz: 6c706e13ce097c7dbf3484701cb88cb6007683dc825f0a4a0b9666fd0fc0bf0dee5fa1b92ba4e63528d118480a0e66df5aa363a9bb0607c5e08ec8b638e0694b

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.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
+
+- Required syntax_tree version 5.0.1 or higher.
+- Drop internal pattern matching in order to support Ruby implementations that don't support it.
+
 ## [2.0.0] - 2022-10-18
 
 ### Added
@@ -72,7 +86,8 @@ 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/v2.0.0...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v3.0.0...HEAD
+[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
 [1.3.1]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.0...v1.3.1

data/Gemfile.lock

@@ -1,40 +1,36 @@
 PATH
   remote: .
   specs:
-    syntax_tree-haml (2.0.0)
-      haml (>= 5.2, != 6.0.0)
+    syntax_tree-haml (4.0.0)
+      haml (>= 5.2)
       prettier_print (>= 1.0.0)
-      syntax_tree (>= 4.0.0)
+      syntax_tree (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.0)
-    haml (6.0.7)
+    haml (6.1.1)
       temple (>= 0.8.2)
       thor
       tilt
-    minitest (5.16.3)
-    prettier_print (1.0.1)
+    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 (4.0.1)
-      prettier_print (>= 1.0.1)
-    temple (0.8.2)
+    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
-  x86_64-linux
+  arm64-darwin-22
 
 DEPENDENCIES
   bundler
@@ -44,4 +40,4 @@ DEPENDENCIES
   syntax_tree-haml!
 
 BUNDLED WITH
-   2.3.6
+   2.4.1

data/lib/syntax_tree/haml/format.rb

@@ -4,9 +4,13 @@ module SyntaxTree
   module Haml
     class Format < Visitor
       class Formatter < ::SyntaxTree::Formatter
-        attr_reader :literal_lines, :quote
+        attr_reader :literal_lines
 
-        def initialize(source, *rest)
+        def initialize(
+          source,
+          *rest,
+          options: ::SyntaxTree::Formatter::Options.new
+        )
           @literal_lines = {}
           source
             .lines
@@ -15,7 +19,7 @@ module SyntaxTree
               @literal_lines[index] = line.rstrip if line.start_with?("!")
             end
 
-          super(source, *rest)
+          super(source, *rest, options: options)
         end
       end
 
@@ -157,7 +161,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,
@@ -270,7 +273,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}:")
@@ -348,17 +351,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-
@@ -412,11 +405,11 @@ module SyntaxTree
       def continuation?(node, child)
         return false if child.type != :silent_script
 
-        case [node.value[:keyword], child.value[:keyword]]
-        in ["case", "in" | "when" | "else"]
-          true
-        in ["if" | "unless", "elsif" | "else"]
-          true
+        case node.value[:keyword]
+        when "case"
+          %w[in when else].include?(child.value[:keyword])
+        when "if", "unless"
+          %w[elsif else].include?(child.value[:keyword])
         else
           false
         end
@@ -434,17 +427,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)
-        case Ripper.sexp(source)
-        in [:program, [[:hash, *], *]] if parsed =
-             ::Haml::AttributeParser.parse(source)
-          parsed.to_h { |key, value| [key, parse_attributes(value)] }
-        in [:program, [[:string_literal, *], *]]
-          SyntaxTree.parse(source).statements.body[0]
-        else
-          LiteralHashValue.new(source)
+        source = source.strip
+        source = source.start_with?("{") ? source : "{#{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 = "2.0.0"
+    VERSION = "4.0.0"
   end
 end

data/lib/syntax_tree/haml.rb

@@ -33,8 +33,8 @@ module SyntaxTree
 
     # This is the main entrypoint for the formatter. It parses the source,
     # builds a formatter, then pretty prints the result.
-    def self.format(source, maxwidth = 80)
-      formatter = Format::Formatter.new(source, +"", maxwidth)
+    def self.format(source, maxwidth = 80, options: Formatter::Options.new)
+      formatter = Format::Formatter.new(source, +"", maxwidth, options: options)
       parse(source).format(formatter)
 
       formatter.flush
@@ -59,24 +59,26 @@ class Haml::Parser::ParseNode
   # accept a visitor in order to walk through the tree.
   def accept(visitor)
     case type
-    in :comment
+    when :comment
       visitor.visit_comment(self)
-    in :doctype
+    when :doctype
       visitor.visit_doctype(self)
-    in :filter
+    when :filter
       visitor.visit_filter(self)
-    in :haml_comment
+    when :haml_comment
       visitor.visit_haml_comment(self)
-    in :plain
+    when :plain
       visitor.visit_plain(self)
-    in :root
+    when :root
       visitor.visit_root(self)
-    in :script
+    when :script
       visitor.visit_script(self)
-    in :silent_script
+    when :silent_script
       visitor.visit_silent_script(self)
-    in :tag
+    when :tag
       visitor.visit_tag(self)
+    else
+      raise "Unknown node type: #{type}"
     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", ">= 4.0.0"
+  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: 2.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-18 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: 4.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        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