w_syntax_tree-erb 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 657167139e259c320442756b2da4ce405e3ef3df7c3c370e6cd681561c3e7de6
-  data.tar.gz: 7f369c4b9bb2416a533a10734a4b384496712712e9787465d96ff76661a8be6d
+  metadata.gz: 6b67bfa283053d82054d6b3f6f41723c4d9ffb6a54431c3e548eeceb0f3d53ef
+  data.tar.gz: 5de3bfd5e3a883a4d8cd595bf525298a7fc24b110acb32e8542aeebcd3e68b98
 SHA512:
-  metadata.gz: 2a4efea93faf97c4fe05e9a7af6e0dcfd488ffbdea1ad1380e4d13d2a033490cc65ce275b3311d1c1d4c50d7d59efce2552fdd4e13a8324fc8cd5d514ac1c513
-  data.tar.gz: 022be3662cdffa4bf6416354a1f8b518bf1ca0f84875c99d5a919519b7b48e8e8ec608f132c6e3a0f1eaeb2651a7ae337dec0b7961ea14782019205f0221faa2
+  metadata.gz: 3be81363e0f5c65864c43d225f4ffb56c3f1e7d5e32ef8a8188e64481d4b6124aa046399e9df05db10c64973eb459c40de63508b343789e0a9afda8fbf64a979
+  data.tar.gz: 22fd1884afe7d82abd172440c5a712b54101730718352acd3078ef7b37f2d79a503da90f90fa5c0831759be465bc6df0af6471a7ab015bb3a673db2df73d19c1

data/CHANGELOG.md

@@ -6,6 +6,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.10.3] - 2023-08-27
+
+## Fixes
+
+- Allows parsing ERB-tags with if, else and end in the same tag
+
+```erb
+<%= if true
+  what
+end %>
+```
+
+This opens the possibility for formatting all if-statements with SyntaxTree properly
+and removes the fix where any if-statement was force to one line.
+
 ## [0.10.2] - 2023-08-22
 
 ### Fixes

data/Gemfile.lock

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

data/lib/syntax_tree/erb/format.rb

@@ -114,7 +114,7 @@ module SyntaxTree
           q.text(" ")
           visit(node.keyword)
         end
-        node.content.nil? ? q.text(" ") : visit(node.content)
+        node.content.blank? ? q.text(" ") : visit(node.content)
 
         visit(node.closing_tag)
       end
@@ -163,7 +163,8 @@ module SyntaxTree
 
       def format_statement(statement)
         formatter =
-          SyntaxTree::Formatter.new("", [], erb_print_width(statement))
+          SyntaxTree::Formatter.new("", [], SyntaxTree::ERB::MAX_WIDTH)
+
         formatter.format(statement)
         formatter.flush
         rows = formatter.output.join.split("\n")
@@ -305,24 +306,6 @@ module SyntaxTree
         node.respond_to?(:new_line) ? node.new_line&.count || 0 : 0
       end
 
-      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.
-        check_for_if_statement(node) ? 999_999 : SyntaxTree::ERB::MAX_WIDTH
-      end
-
-      def check_for_if_statement(node)
-        return false if node.nil?
-
-        if node.is_a?(SyntaxTree::IfNode) || node.is_a?(SyntaxTree::IfOp)
-          return true
-        end
-
-        node.child_nodes.any? do |child_node|
-          check_for_if_statement(child_node)
-        end
-      end
-
       def handle_child_nodes(child_nodes)
         group = []
 

data/lib/syntax_tree/erb/nodes.rb

@@ -295,16 +295,7 @@ module SyntaxTree
             )
           end
 
-        @content =
-          if content.is_a?(ErbContent)
-            content
-          else
-            # Set content to nil if it is empty
-            content ||= []
-            content = content.map(&:value).join if content.is_a?(Array)
-            ErbContent.new(value: content) unless content.strip.empty?
-          end
-
+        @content = prepare_content(content)
         @closing_tag = closing_tag
       end
 
@@ -338,6 +329,24 @@ module SyntaxTree
           closing_tag: closing_tag
         )
       end
+
+      private
+
+      def prepare_content(content)
+        if content.is_a?(ErbContent)
+          content
+        else
+          # Set content to nil if it is empty
+          content ||= []
+
+          ErbContent.new(value: content)
+        end
+      rescue SyntaxTree::Parser::ParseError
+        # Try to add the keyword to see if it parses
+        result = ErbContent.new(value: [keyword, *content])
+        @keyword = nil
+        result
+      end
     end
 
     class ErbBlock < Block
@@ -413,7 +422,7 @@ module SyntaxTree
 
     class ErbElse < ErbIf
       def accept(visitor)
-        visitor.visit_erb_if(self)
+        visitor.visit_erb_else(self)
       end
     end
 
@@ -448,16 +457,23 @@ module SyntaxTree
     end
 
     class ErbContent < Node
-      attr_reader(:value, :unparsed_value)
+      attr_reader(:value)
 
       def initialize(value:)
-        @unparsed_value = value
-        begin
-          @value = SyntaxTree.parse(value.strip)
-        rescue SyntaxTree::Parser::ParseError
-          # Removes leading and trailing whitespace
-          @value = value&.lstrip&.rstrip
+        if value.is_a?(Array)
+          value =
+            value.map { |token| token.is_a?(Token) ? token.value : token }.join
         end
+        @value = SyntaxTree.parse(value.strip)
+      end
+
+      def blank?
+        value.nil? ||
+          value
+            .statements
+            .child_nodes
+            .reject { |node| node.is_a?(SyntaxTree::VoidStmt) }
+            .empty?
       end
 
       def accept(visitor)

data/lib/syntax_tree/erb/parser.rb

@@ -588,7 +588,7 @@ module SyntaxTree
             location: opening_tag.location.to(closing_tag.location)
           )
 
-        case keyword&.type
+        case erb_node.keyword&.type
         when :erb_if, :erb_unless, :erb_elsif
           parse_erb_if(erb_node)
         when :erb_case, :erb_when

data/lib/syntax_tree/erb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: w_syntax_tree-erb
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Kevin Newton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Syntax Tree support for ERB