w_syntax_tree-erb 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1234ed5afef9a96ebefb415733354ac530ffa9bb35b718195d36be9f9fed7c
-  data.tar.gz: 03c589bb628753e874f05aa6ea504f0d3d14e2057a7843d919abfd31f9fc66e9
+  metadata.gz: bc192c98db6bb573305fc6bfec6cbf35415eb53376ddb19a977e95f0d0812453
+  data.tar.gz: 20c52afb0c5650fcb0ed0cfac5ad259e852a958ee1480d6c201d465e2dca2f33
 SHA512:
-  metadata.gz: cb5dd5cad343aabf4eaa8bd8cb177eeabb673cf68b8a016f36c13ee5ff2fbbb277a313800849cee940013355e430edca26d5d8541d566588f7902c41816d20a9
-  data.tar.gz: 3a147354e9fbef1bf89b604033c57f3746f1e17e69d050e7b4b41ffc409005000f4a7e5a12085e2704da71c4de4e16691795f6fe4600ba04de1106f5179c15b6
+  metadata.gz: 4037694cab3fb721931d23d6b71b6702c8317a8cfcc02385f5ffead99b12b05928a449cf61f2d5ccd56fde08a42c1a3eab5bce933930e5af7758334c078a2e6c
+  data.tar.gz: fac163a673ebf3f60900162cd63f3f6cc7d5f227ecb7098d72a769a9156d031a7f579b1237e5fa63fc50d8a5672c487f433d6e2b940fc39a002c28cb055ee26f

data/CHANGELOG.md

@@ -6,11 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
-## [0.0.1] - 2023-05-25
+## [0.9.1] - 2023-06-28
+
+- Handle formatting of multi-line ERB-tags with more than one statement.
+
+## [0.9.0] - 2023-06-22
 
 ### Added
 
-- 🎉 First version based on syntax_tree-xml 🎉
+- 🎉 First version based on syntax_tree-xml 🎉.
+- 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.1.0...HEAD
-[0.0.1]: https://github.com/davidwessman/syntax_tree-erb/compare/b280a...v0.1.0
+[unreleased]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.9.0...HEAD
+[0.9.0]: https://github.com/davidwessman/syntax_tree-erb/compare/419727a73af94057ca0980733e69ac8b4d52fdf4...v0.9.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    syntax_tree-erb (0.0.1)
+    w_syntax_tree-erb (0.9.1)
       prettier_print (>= 1.2.0)
       syntax_tree (>= 6.1.1)
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.0)
-    minitest (5.18.0)
+    minitest (5.18.1)
     prettier_print (1.2.1)
     rake (13.0.6)
     simplecov (0.22.0)
@@ -32,7 +32,7 @@ DEPENDENCIES
   minitest
   rake
   simplecov
-  syntax_tree-erb!
+  w_syntax_tree-erb!
 
 BUNDLED WITH
    2.4.1

data/README.md

@@ -33,6 +33,8 @@ Add this line to your application's Gemfile:
 gem "w_syntax_tree-erb", "~> 0.9", require: false
 ```
 
+> I added the `w_` prefix to avoid conflicts if there will ever be an official `syntax_tree-erb` gem.
+
 ## Usage
 
 ```sh

data/lib/syntax_tree/erb/format.rb

@@ -80,8 +80,7 @@ module SyntaxTree
           q.text(" ")
           visit(node.keyword)
         end
-
-        visit(node.content)
+        node.content.nil? ? q.text(" ") : visit(node.content)
 
         visit(node.closing_tag)
       end
@@ -104,29 +103,44 @@ module SyntaxTree
       end
 
       def visit_erb_content(node)
-        rows =
-          if node.value.is_a?(String)
-            node.value.split("\n")
-          else
-            formatter =
-              SyntaxTree::Formatter.new("", [], erb_print_width(node.value))
-            formatter.format(node.value.statements)
-            formatter.flush
-            formatter.output.join.split("\n")
-          end
+        if node.value.is_a?(String)
+          output_rows(node.value.split("\n"))
+        else
+          child_nodes = node.value&.statements&.child_nodes || []
 
-        if rows.size > 1
-          q.group do
+          if child_nodes.size == 1
             q.text(" ")
-            q.seplist(rows, -> { q.breakable(" ") }) { |row| q.text(row) }
+            q.seplist(child_nodes, -> { q.breakable("") }) do |child_node|
+              format_statement(child_node)
+            end
             q.text(" ")
+          elsif child_nodes.size > 1
+            q.indent do
+              q.breakable("")
+              q.seplist(child_nodes, -> { q.breakable("") }) do |child_node|
+                format_statement(child_node)
+              end
+            end
+            q.breakable
           end
+        end
+      end
+
+      def format_statement(statement)
+        formatter =
+          SyntaxTree::Formatter.new("", [], erb_print_width(statement))
+        formatter.format(statement)
+        formatter.flush
+        rows = formatter.output.join.split("\n")
+
+        output_rows(formatter.output.join.split("\n"))
+      end
+
+      def output_rows(rows)
+        if rows.size > 1
+          q.seplist(rows, -> { q.breakable("") }) { |row| q.text(row) }
         elsif rows.size == 1
-          q.text(" ")
           q.text(rows.first)
-          q.text(" ")
-        else
-          q.text(" ")
         end
       end
 
@@ -203,15 +217,10 @@ module SyntaxTree
         end
       end
 
-      def erb_print_width(syntax_tree)
-        statements = syntax_tree.statements.body
+      def erb_print_width(node)
         # Set the width to maximum if we have an IfNode or IfOp,
         # we cannot format them purely with SyntaxTree because the ERB-syntax will be unparseable.
-        if statements.any? { |node| check_for_if_statement(node) }
-          999_999
-        else
-          SyntaxTree::ERB::MAX_WIDTH
-        end
+        check_for_if_statement(node) ? 999_999 : SyntaxTree::ERB::MAX_WIDTH
       end
 
       def check_for_if_statement(node)

data/lib/syntax_tree/erb/nodes.rb

@@ -220,8 +220,19 @@ module SyntaxTree
 
       def initialize(opening_tag:, keyword:, content:, closing_tag:, location:)
         @opening_tag = opening_tag
-        @keyword = keyword
-        @content = ErbContent.new(value: content.map(&:value).join) if content
+        # prune whitespace from keyword
+        @keyword =
+          if keyword
+            Token.new(
+              type: keyword.type,
+              value: keyword.value.strip,
+              location: keyword.location
+            )
+          end
+        # Set content to nil if it is empty
+        content ||= []
+        content = content.map(&:value).join if content.is_a?(Array)
+        @content = ErbContent.new(value: content) unless content.strip.empty?
         @closing_tag = closing_tag
         @location = location
       end

data/lib/syntax_tree/erb/pretty_print.rb

@@ -108,12 +108,12 @@ module SyntaxTree
       end
 
       def visit_erb_end(node)
-        q.text("erb_end")
+        q.pp("erb_end")
       end
 
       # Visit an ErbContent node.
       def visit_erb_content(node)
-        q.text(node.value)
+        q.pp(node.value)
       end
 
       # Visit an Attribute node.
@@ -132,7 +132,7 @@ module SyntaxTree
       end
 
       def visit_erb_close(node)
-        visit_node("erb_close", node)
+        visit(node.closing)
       end
 
       def visit_erb_do_close(node)

data/lib/syntax_tree/erb/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module ERB
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

metadata

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