Release: 1.14.7

beautifier · Oct 21, 2022 · 01c1c89 · 01c1c89
1 parent 90b32ec
commit 01c1c89
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/js/lib/beautifier.js b/js/lib/beautifier.js
diff --git a/js/lib/beautifier.js.map b/js/lib/beautifier.js.map
diff --git a/js/lib/beautifier.min.js b/js/lib/beautifier.min.js
diff --git a/js/lib/beautifier.min.js.map b/js/lib/beautifier.min.js.map
diff --git a/js/lib/beautify-html.js b/js/lib/beautify-html.js
@@ -2406,7 +2406,7 @@ Beautifier.prototype._get_tag_open_token = function(raw_token) { //function to g
 
   parser_token.is_unformatted = !parser_token.tag_complete && in_array(parser_token.tag_check, this._options.unformatted);
   parser_token.is_content_unformatted = !parser_token.is_empty_element && in_array(parser_token.tag_check, this._options.content_unformatted);
-  parser_token.is_inline_element = in_array(parser_token.tag_name, this._options.inline) || parser_token.tag_start_char === '{';
+  parser_token.is_inline_element = in_array(parser_token.tag_name, this._options.inline) || parser_token.tag_name.includes("-") || parser_token.tag_start_char === '{';
 
   return parser_token;
 };

diff --git a/js/test/generated/beautify-html-tests.js b/js/test/generated/beautify-html-tests.js
@@ -9078,6 +9078,42 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '{{/row}}');
 
 
+        //============================================================
+        // Does not add whitespace around custom elements 
+        reset_options();
+        set_name('Does not add whitespace around custom elements ');
+        bth(
+            '<span>\n' +
+            '    <span>\n' +
+            '        <span>The time for this result is 1:02</span\n' +
+            '        ><div>.</div\n' +
+            '        ><section>27</section>\n' +
+            '    </span>\n' +
+            '</span>',
+            //  -- output --
+            '<span>\n' +
+            '    <span>\n' +
+            '        <span>The time for this result is 1:02</span>\n' +
+            '        <div>.</div>\n' +
+            '        <section>27</section>\n' +
+            '    </span>\n' +
+            '</span>');
+        bth(
+            '<span>\n' +
+            '    <span>\n' +
+            '        <span>The time for this result is 1:02</span\n' +
+            '        ><time-dot>.</time-dot\n' +
+            '        ><time-decimals>27</time-decimals>\n' +
+            '    </span>\n' +
+            '</span>',
+            //  -- output --
+            '<span>\n' +
+            '    <span>\n' +
+            '        <span>The time for this result is 1:02</span><time-dot>.</time-dot><time-decimals>27</time-decimals>\n' +
+            '    </span>\n' +
+            '</span>');
+
+
         //============================================================
         // New Test Suite
         reset_options();