w_syntax_tree-erb 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b67bfa283053d82054d6b3f6f41723c4d9ffb6a54431c3e548eeceb0f3d53ef
-  data.tar.gz: 5de3bfd5e3a883a4d8cd595bf525298a7fc24b110acb32e8542aeebcd3e68b98
+  metadata.gz: 5da234530c78c55f3594957cdf44e380ed603b92e52c023df68f015d0d8c7f45
+  data.tar.gz: 99b3b25d533a09e6337cc552c5f6d9224e977586272afb4c358df277e08c09eb
 SHA512:
-  metadata.gz: 3be81363e0f5c65864c43d225f4ffb56c3f1e7d5e32ef8a8188e64481d4b6124aa046399e9df05db10c64973eb459c40de63508b343789e0a9afda8fbf64a979
-  data.tar.gz: 22fd1884afe7d82abd172440c5a712b54101730718352acd3078ef7b37f2d79a503da90f90fa5c0831759be465bc6df0af6471a7ab015bb3a673db2df73d19c1
+  metadata.gz: a408ef26dd34ae012f516224090d65eea520b795c7a50080a8ed603b09095bc0eb7198e97b0ea7d75b9d113896344496cf1854442bf3ee9eab276e2437e86893
+  data.tar.gz: dbd2ff290949bc982fe16b7c3153ae01b09adfd8d4fd9e710cca7b6a3dce19646b770274cd00f0438d42ca3daa7a89b824411a9624db98e4aff13b014db03478

data/CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.10.4] - 2023-08-28
+
+- Avoid grouping single tags
+- Handle multiline ERB-comments
+
 ## [0.10.3] - 2023-08-27
 
 ## Fixes
@@ -98,7 +103,10 @@ Output:
 - Can format a lot of .html.erb-syntax and works as a plugin to syntax_tree.
 - This is still early and there are a lot of different weird syntaxes out there.
 
-[unreleased]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.1...HEAD
+[unreleased]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.4...HEAD
+[0.10.4]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.3...v0.10.4
+[0.10.3]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.2...v0.10.3
+[0.10.2]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.1...v0.10.2
 [0.10.1]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.0...v0.10.1
 [0.10.0]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.9.5...v0.10.0
 [0.9.5]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.9.4...v0.9.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    w_syntax_tree-erb (0.10.3)
+    w_syntax_tree-erb (0.10.4)
       prettier_print (~> 1.2, >= 1.2.0)
       syntax_tree (~> 6.1, >= 6.1.1)
 

data/lib/syntax_tree/erb/format.rb

@@ -114,6 +114,7 @@ module SyntaxTree
           q.text(" ")
           visit(node.keyword)
         end
+
         node.content.blank? ? q.text(" ") : visit(node.content)
 
         visit(node.closing_tag)
@@ -137,27 +138,25 @@ module SyntaxTree
       end
 
       def visit_erb_content(node)
-        if node.value.is_a?(String)
-          output_rows(node.value.split("\n"))
-        else
-          nodes = node.value&.statements&.child_nodes || []
-          nodes = nodes.reject { |node| node.is_a?(SyntaxTree::VoidStmt) }
+        # Reject all VoidStmt to avoid empty lines
+        nodes =
+          (node.value&.statements&.child_nodes || []).reject do |node|
+            node.is_a?(SyntaxTree::VoidStmt)
+          end
 
-          if nodes.size == 1
-            q.text(" ")
+        if nodes.size == 1
+          q.text(" ")
+          format_statement(nodes.first)
+          q.text(" ")
+        elsif nodes.size > 1
+          q.indent do
+            q.breakable("")
             q.seplist(nodes, -> { q.breakable("") }) do |child_node|
               format_statement(child_node)
             end
-            q.text(" ")
-          elsif nodes.size > 1
-            q.indent do
-              q.breakable("")
-              q.seplist(nodes, -> { q.breakable("") }) do |child_node|
-                format_statement(child_node)
-              end
-            end
-            q.breakable
           end
+
+          q.breakable
         end
       end
 
@@ -341,20 +340,26 @@ module SyntaxTree
       end
 
       def handle_group(nodes, break_after:)
-        return unless nodes.any?
-
-        q.group do
-          nodes.each_with_index do |node, group_index|
-            visit(node)
-            next_node = nodes[group_index + 1]
-            next if next_node.nil?
-            breakable_between_group(node, next_node)
-          end
+        if nodes.size == 1
+          handle_group_nodes(nodes)
+        elsif nodes.size > 1
+          q.group { handle_group_nodes(nodes) }
+        else
+          return
         end
 
         breakable_between_group(nodes.last, nil) if break_after
       end
 
+      def handle_group_nodes(nodes)
+        nodes.each_with_index do |node, group_index|
+          visit(node)
+          next_node = nodes[group_index + 1]
+          next if next_node.nil?
+          breakable_between_group(node, next_node)
+        end
+      end
+
       def node_should_group(node)
         node.is_a?(SyntaxTree::ERB::CharData) ||
           node.is_a?(SyntaxTree::ERB::ErbNode)

data/lib/syntax_tree/erb/parser.rb

@@ -94,7 +94,7 @@ module SyntaxTree
                 # <!DOCTYPE
                 enum.yield :doctype, $&, index, line
                 state << :inside
-              when /\A<%#.*%>/
+              when /\A<%#[\s\S]*?%>/
                 # An ERB-comment
                 # <%# this is an ERB comment %>
                 enum.yield :erb_comment, $&, index, line

data/lib/syntax_tree/erb/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module ERB
-    VERSION = "0.10.3"
+    VERSION = "0.10.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: w_syntax_tree-erb
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Kevin Newton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-27 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print