Merge pull request #2502 from JessenReinhart/fix/handlebars-tag-stack-2045

fix(html): prevent Handlebars tags from corrupting HTML tag stack

Author: bitwiseman

js/src/html/beautifier.js

@@ -816,6 +816,15 @@ Beautifier.prototype._do_optional_end_element = function(parser_token) {
   // are handled automatically by the beautifier.
   // It assumes parent or ancestor close tag closes all children.
   // https://www.w3.org/TR/html5/syntax.html#optional-tags
+  // Handlebars tags ({{#tag}}, {{/tag}}, etc.) must not participate in
+  // HTML optional end-element logic — otherwise a Handlebars helper like
+  // {{#tr}} is mistaken for the HTML <tr> tag and incorrectly pops it
+  // from the tag stack, breaking indentation inside table rows.
+  if (parser_token.tag_start_char === '{') {
+    parser_token.parent = this._tag_stack.get_parser_token();
+    return;
+  }
+
   if (parser_token.is_empty_element || !parser_token.is_start_tag || !parser_token.parent) {
     return;
 

test/data/html/tests.js

@@ -1736,6 +1736,58 @@ exports.test_data = {
         unchanged: '<span>{{condition < 0 ? "result1" : "result2"}}</span>'
       }, {
         unchanged: '<span>{{condition1 && condition2 && condition3 && condition4 < 0 ? "resForTrue" : "resForFalse"}}</span>'
+      }, {
+        comment: "Issue #2045 - {{#tr}} helper inside a table must not pop the HTML <tr> from the tag stack",
+        input_: [
+          '<table>',
+          '<tr>',
+          '<td>',
+          '{{#tr}}translated{{/tr}}',
+          '</td>',
+          '</tr>',
+          '</table>'
+        ],
+        output: [
+          '<table>',
+          '    <tr>',
+          '        <td>',
+          '            {{#tr}}translated{{/tr}}',
+          '        </td>',
+          '    </tr>',
+          '</table>'
+        ]
+      }, {
+        comment: "Issue #2045 - {{#li}} helper inside a list item must not pop the HTML <li> from the tag stack",
+        input_: [
+          '<ul>',
+          '<li>',
+          '{{#li}}item{{/li}}',
+          '</li>',
+          '</ul>'
+        ],
+        output: [
+          '<ul>',
+          '    <li>',
+          '        {{#li}}item{{/li}}',
+          '    </li>',
+          '</ul>'
+        ]
+      }, {
+        comment: "Issue #2045 - {{#option}} helper inside an option must not pop the HTML <option> from the tag stack",
+        input_: [
+          '<select>',
+          '<option>',
+          '{{#option}}text{{/option}}',
+          '</option>',
+          '</select>'
+        ],
+        output: [
+          '<select>',
+          '    <option>',
+          '        {{#option}}text{{/option}}',
+          '    </option>',
+          '</select>'
+        ]
       }
     ]
   }, {