From 95f29e11e453954b670e2845496d39e8e128aef5 Mon Sep 17 00:00:00 2001 From: David Wessman Date: Sat, 1 Jul 2023 15:37:28 +0200 Subject: [PATCH] 0.9.4: Format empty HTML-tags as a group ```diff - +> ``` --- CHANGELOG.md | 14 ++++++++++++++ lib/syntax_tree/erb/format.rb | 5 ++++- lib/syntax_tree/erb/version.rb | 2 +- .../javascript_frameworks_formatted.html.erb | 8 ++++++-- .../javascript_frameworks_unformatted.html.erb | 3 +++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36978f5..50cffd5 100644 --- 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 + +- ++> +``` + ## [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 index 64d91f2..1af613a 100644 --- 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 index d9398fb..bf2155c 100644 --- 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 index 99dbd99..a8b0ff8 100644 --- 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" - > - + >