@reteps/tree-sitter-htmlmustache 0.4.1 → 0.4.2

package/cli/out/main.js

@@ -2813,13 +2813,50 @@ function formatMustacheSection(node, context) {
     parts.push(text(mustacheText(beginNode.text, context)));
   }
   const hasImplicit = hasImplicitEndTags(contentNodes);
-  const isStaircase = !hasImplicit && contentNodes.length > 0 && contentNodes.every((n) => n.type === "html_erroneous_end_tag");
-  if (isStaircase) {
-    const E = contentNodes.length;
-    for (let i = 0; i < E; i++) {
-      const formatted = formatNode(contentNodes[i], context);
-      parts.push(indentN(concat([hardline, formatted]), E - i));
+  const erroneousCount = contentNodes.filter((n) => n.type === "html_erroneous_end_tag").length;
+  const hasStaircase = !hasImplicit && erroneousCount > 0;
+  if (hasStaircase) {
+    let virtualDepth = erroneousCount - 1;
+    const groupNodes = [];
+    let lastNodeEnd = -1;
+    let pendingBlankLine = false;
+    let groupBlankLine = false;
+    const emitGroup = () => {
+      if (groupNodes.length === 0) return;
+      const formatted = formatBlockChildren(groupNodes, context);
+      if (hasDocContent(formatted)) {
+        if (groupBlankLine) parts.push("\n");
+        const depth = Math.max(0, virtualDepth + 1);
+        parts.push(depth > 0 ? indentN(concat([hardline, formatted]), depth) : concat([hardline, formatted]));
+      }
+      groupNodes.length = 0;
+      groupBlankLine = false;
+    };
+    for (const node2 of contentNodes) {
+      if (lastNodeEnd >= 0 && node2.startIndex > lastNodeEnd) {
+        const gap = context.document.getText().slice(lastNodeEnd, node2.startIndex);
+        if ((gap.match(/\n/g) || []).length >= 2) {
+          pendingBlankLine = true;
+        }
+      }
+      if (node2.type === "html_erroneous_end_tag") {
+        emitGroup();
+        if (pendingBlankLine) parts.push("\n");
+        pendingBlankLine = false;
+        const formatted = formatNode(node2, context);
+        const depth = Math.max(0, virtualDepth);
+        parts.push(depth > 0 ? indentN(concat([hardline, formatted]), depth) : concat([hardline, formatted]));
+        virtualDepth--;
+      } else {
+        if (groupNodes.length === 0) {
+          groupBlankLine = pendingBlankLine;
+          pendingBlankLine = false;
+        }
+        groupNodes.push(node2);
+      }
+      lastNodeEnd = node2.endIndex;
     }
+    emitGroup();
     parts.push(hardline);
   } else {
     const formattedContent = formatBlockChildren(contentNodes, context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/tree-sitter-htmlmustache",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "HTML with Mustache/Handlebars template syntax grammar for tree-sitter",
   "repository": {
     "type": "git",