w_syntax_tree-erb 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5da234530c78c55f3594957cdf44e380ed603b92e52c023df68f015d0d8c7f45
-  data.tar.gz: 99b3b25d533a09e6337cc552c5f6d9224e977586272afb4c358df277e08c09eb
+  metadata.gz: d75bcbb66fc50b3559fa73a7ecb906aaa208a16bf041ae95793aed008bdd60f6
+  data.tar.gz: d2f882155d6e2ab774de0367586926c853a367c55123f7bc05edebebbba9fe6d
 SHA512:
-  metadata.gz: a408ef26dd34ae012f516224090d65eea520b795c7a50080a8ed603b09095bc0eb7198e97b0ea7d75b9d113896344496cf1854442bf3ee9eab276e2437e86893
-  data.tar.gz: dbd2ff290949bc982fe16b7c3153ae01b09adfd8d4fd9e710cca7b6a3dce19646b770274cd00f0438d42ca3daa7a89b824411a9624db98e4aff13b014db03478
+  metadata.gz: d7e9cc9b0c675244216ffd52db0751ee59b6ba79af00cb2b56ff955e351aa51c5a5d25d2737084283fa00707d51f4fb38fb7b6bbddf0c6bcc9f2831afd1fe9e1
+  data.tar.gz: 2cd81b89e3ebdd1b1010f7c7509c9ef9a81eacf30d2285c34c36d3a97b7e86cb8d7d4f460ea3a7ba2ad1dd333b2e2e6a709056d328ff373b8692218701892d57

data/.github/ISSUE_TEMPLATE/formatting-report.md

@@ -8,7 +8,7 @@ assignees: davidwessman
 ---
 
 <details>
-  <summary>ERB-snippet</summary
+  <summary>ERB-snippet</summary>
 
   ```html
   <% code %>
@@ -16,14 +16,14 @@ assignees: davidwessman
 </details>
 
 <details>
-  <summary>Expected formatting</summary
+  <summary>Expected formatting</summary>
 
   ```html
   <% code %>
   ```
 </details>
 <details>
-  <summary>Actual formatting</summary
+  <summary>Actual formatting</summary>
 
   ```html
   <% code %>

data/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.10.5] - 2023-09-03
+
+- Handle ERB-tags inside HTML-tags, like `<div <%= "class='foo'" %>>`
+- Handles indentation for multiline ERB-comment
+- Handles spaces between do-arguments and ERB-tags
+
 ## [0.10.4] - 2023-08-28
 
 - Avoid grouping single tags
@@ -103,7 +109,8 @@ 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.4...HEAD
+[unreleased]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.5...HEAD
+[0.10.5]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.4...v0.10.5
 [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

data/Gemfile.lock

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

data/lib/syntax_tree/erb/format.rb

@@ -121,7 +121,10 @@ module SyntaxTree
       end
 
       def visit_erb_do_close(node)
-        visit(node.closing)
+        closing = node.closing.value.end_with?("-%>") ? "-%>" : "%>"
+        q.text(node.closing.value.gsub(closing, "").rstrip)
+        q.text(" ")
+        q.text(closing)
       end
 
       def visit_erb_close(node)
@@ -236,7 +239,9 @@ module SyntaxTree
       end
 
       def visit_erb_comment(node)
-        visit(node.token)
+        q.seplist(node.token.value.split("\n"), -> { q.breakable }) do |line|
+          q.text(line.lstrip)
+        end
       end
 
       # Visit a CharData node.

data/lib/syntax_tree/erb/parser.rb

@@ -368,10 +368,17 @@ module SyntaxTree
       def parse_html_opening_tag
         opening = consume(:open)
         name = consume(:name)
+
         if name.value =~ /\A[@:#]/
           raise ParseError, "Invalid html-tag name #{name}"
         end
-        attributes = many { parse_html_attribute }
+
+        attributes =
+          many do
+            atleast do
+              maybe { parse_erb_tag } || maybe { parse_html_attribute }
+            end
+          end
 
         closing =
           atleast do

data/lib/syntax_tree/erb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: w_syntax_tree-erb
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Kevin Newton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-03 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.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Syntax Tree support for ERB