0.9.4: Format empty HTML-tags as a group

```diff <three-word-component :attribute1 :attribute2 :attribute3="value" -> -</three-word-component> +></three-word-component> ```
davidwessman · Jul 1, 2023 · 95f29e1 · 95f29e1
1 parent 98227e3
commit 95f29e1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.9.4] - 2023-07-01
+
+- Inline even more empty HTML-tags
+
+```diff
+<three-word-component
+ :attribute1
+ :attribute2
+ :attribute3="value"
+->
+-</three-word-component>
++></three-word-component>
+```
+
 ## [0.9.3] - 2023-06-30
 
 - Print empty html-tags on one line if possible

diff --git a/lib/syntax_tree/erb/format.rb b/lib/syntax_tree/erb/format.rb
@@ -51,7 +51,10 @@ def visit_block(node)
  def visit_html(node)
  # Make sure to group the tags together if there is no child nodes.
  if node.elements.size == 0
- q.group { visit_block(node) }
+ q.group do
+ visit(node.opening)
+ visit(node.closing)
+ end
  else
  visit_block(node)
  end

diff --git a/lib/syntax_tree/erb/version.rb b/lib/syntax_tree/erb/version.rb
@@ -2,6 +2,6 @@
 
 module SyntaxTree
  module ERB
- VERSION = "0.9.3"
+ VERSION = "0.9.4"
  end
 end
diff --git a/test/fixture/javascript_frameworks_formatted.html.erb b/test/fixture/javascript_frameworks_formatted.html.erb
@@ -6,8 +6,7 @@
  boolean
  :value="['a', 'b']"
  :long-variable-name="data.item.javascript.code"
- >
- </card-header>
+ ></card-header>
 
  <card-body :content="<%= @content %>" @click="doThis">
  <template #button-content>
@@ -16,6 +15,11 @@
  </card-body>
 </div>
 
+<three-word-component
+ :allowed-words="['first', 'second', 'third', 'fourth']"
+ :disallowed-words="['fifth', 'sixth']"
+></three-word-component>
+
 <!-- Alpine -->
 <div
  x-data="{open: false}"

diff --git a/test/fixture/javascript_frameworks_unformatted.html.erb b/test/fixture/javascript_frameworks_unformatted.html.erb
@@ -3,5 +3,8 @@
 
 <card-body :content="<%= @content %>" @click="doThis"><template #button-content>Hello</template></card-body></div>
 
+<three-word-component :allowed-words="['first', 'second', 'third', 'fourth']" :disallowed-words="['fifth', 'sixth']">
+</three-word-component>
+
 <!-- Alpine --><div x-data="{open: false}" class="absolute bottom-0" x-transition:enter="transition ease-out" x-transition:leave="transition ease-in">
 <button @click="open = true">Expand</button><span x-show="open"><h1>Hello</h1></span></div>