@reteps/tree-sitter-htmlmustache 0.0.37 → 0.0.39

package/cli/out/main.js

@@ -1739,29 +1739,33 @@ var ERROR_NODE_TYPES = /* @__PURE__ */ new Set([
 function collectErrors(tree, file) {
   const errors = [];
   const cursor = tree.walk();
-  function visit() {
+  function visit(insideMustacheSection) {
     const node = cursor.currentNode;
     const nodeType = cursor.nodeType;
     if (ERROR_NODE_TYPES.has(nodeType) || cursor.nodeIsMissing) {
-      errors.push({
-        file,
-        line: node.startPosition.row + 1,
-        column: node.startPosition.column + 1,
-        endLine: node.endPosition.row + 1,
-        endColumn: node.endPosition.column + 1,
-        message: errorMessageForNode(nodeType, node),
-        nodeText: node.text
-      });
+      const skip = insideMustacheSection && nodeType === "html_erroneous_end_tag";
+      if (!skip) {
+        errors.push({
+          file,
+          line: node.startPosition.row + 1,
+          column: node.startPosition.column + 1,
+          endLine: node.endPosition.row + 1,
+          endColumn: node.endPosition.column + 1,
+          message: errorMessageForNode(nodeType, node),
+          nodeText: node.text
+        });
+      }
       if (nodeType === "ERROR") return;
     }
+    const enteringMustacheSection = nodeType === "mustache_section" || nodeType === "mustache_inverted_section";
     if (cursor.gotoFirstChild()) {
       do {
-        visit();
+        visit(insideMustacheSection || enteringMustacheSection);
       } while (cursor.gotoNextSibling());
       cursor.gotoParent();
     }
   }
-  visit();
+  visit(false);
   return errors;
 }
 function formatError(error, source) {
@@ -2664,6 +2668,10 @@ function hasImplicitEndTagsRecursive(node) {
   }
   return false;
 }
+function isInlineContentNode(node) {
+  if (node.type === "text") return node.text.trim().length > 0;
+  return node.type === "mustache_interpolation" || node.type === "mustache_triple" || node.type === "mustache_partial";
+}
 function isInTextFlow(node, index, nodes) {
   if (index > 0) {
     const prev = nodes[index - 1];
@@ -2679,6 +2687,21 @@ function isInTextFlow(node, index, nodes) {
   }
   return false;
 }
+function hasAdjacentInlineContent(index, nodes) {
+  for (let i = index - 1; i >= 0; i--) {
+    const n = nodes[i];
+    if (n.type === "text" && n.text.trim().length === 0) continue;
+    if (isInlineContentNode(n)) return true;
+    break;
+  }
+  for (let i = index + 1; i < nodes.length; i++) {
+    const n = nodes[i];
+    if (n.type === "text" && n.text.trim().length === 0) continue;
+    if (isInlineContentNode(n)) return true;
+    break;
+  }
+  return false;
+}
 function shouldHtmlElementStayInline(node, index, nodes) {
   if (node.type !== "html_element") {
     return false;
@@ -2686,6 +2709,9 @@ function shouldHtmlElementStayInline(node, index, nodes) {
   if (isInTextFlow(node, index, nodes)) {
     return true;
   }
+  if (hasAdjacentInlineContent(index, nodes)) {
+    return true;
+  }
   if (index > 0) {
     const prev = nodes[index - 1];
     if (prev.type === "html_element" && isInTextFlow(prev, index - 1, nodes)) {
@@ -3148,12 +3174,13 @@ function formatStartTag(node, context) {
     }
     attrParts.push(attrs[i]);
   }
+  const breakClosingBracket = isSelfClosing ? "/>" : ">";
   return group(
     concat([
       text("<"),
       text(tagNameText),
       indent(concat([line, concat(attrParts)])),
-      ifBreak(concat([hardline, text(closingBracket)]), text(closingBracket))
+      ifBreak(concat([hardline, text(breakClosingBracket)]), text(closingBracket))
     ])
   );
 }
@@ -3263,10 +3290,10 @@ function formatBlockChildren(nodes, context) {
       }
       const rawText = context.document.getText().slice(ignoreRegionStartIndex, node.startIndex).replace(/^\n/, "").replace(/\n$/, "");
       if (rawText.length > 0) {
-        lines.push({ doc: text(rawText), blankLineBefore: false });
+        lines.push({ doc: text(rawText), blankLineBefore: false, rawLine: true });
       }
       const commentText = node.type === "mustache_comment" ? mustacheText(node.text, context) : node.text;
-      lines.push({ doc: text(commentText), blankLineBefore: false });
+      lines.push({ doc: text(commentText), blankLineBefore: false, rawLine: true });
       inIgnoreRegion = false;
       ignoreRegionStartIndex = -1;
       lastNodeEnd = node.endIndex;
@@ -3433,7 +3460,12 @@ function formatBlockChildren(nodes, context) {
         }
       } else {
         if (node.type === "text" && typeof formatted === "string") {
-          currentLine.push(...textWords(formatted));
+          const words = textWords(formatted);
+          if (words.length > 0) {
+            currentLine.push(...words);
+          } else if (node.text.trim() === "" && currentLine.length > 0) {
+            currentLine.push(line);
+          }
         } else {
           currentLine.push(formatted);
         }
@@ -3445,7 +3477,7 @@ function formatBlockChildren(nodes, context) {
     const lastNode = nodes[nodes.length - 1];
     const rawText = context.document.getText().slice(ignoreRegionStartIndex, lastNode.endIndex).replace(/^\n/, "");
     if (rawText.length > 0) {
-      lines.push({ doc: text(rawText), blankLineBefore: false });
+      lines.push({ doc: text(rawText), blankLineBefore: false, rawLine: true });
     }
   }
   if (currentLine.length > 0) {
@@ -3463,7 +3495,11 @@ function formatBlockChildren(nodes, context) {
       if (lines[i].blankLineBefore) {
         parts.push("\n");
       }
-      parts.push(hardline);
+      if (lines[i].rawLine) {
+        parts.push("\n");
+      } else {
+        parts.push(hardline);
+      }
     }
     parts.push(lines[i].doc);
   }

package/grammar.js

@@ -281,12 +281,12 @@ module.exports = grammar({
     _attribute_value_no_double_quote: ($) =>
       choice(
         $._mustache_node,
-        alias($._html_attribute_value_no_single_quote, $.text),
+        alias($._html_attribute_value_no_double_quote, $.text),
       ),
     _attribute_value_no_single_quote: ($) =>
       choice(
         $._mustache_node,
-        alias($._html_attribute_value_no_double_quote, $.text),
+        alias($._html_attribute_value_no_single_quote, $.text),
       ),
     _mustache_section_no_single_quote: ($) =>
       seq(
@@ -370,6 +370,7 @@ module.exports = grammar({
       ),
     _mustache_node_no_single_quote: ($) =>
       choice(
+        $.mustache_triple,
         $.mustache_interpolation,
         alias($._mustache_comment_no_single_quote, $.mustache_comment),
         alias($._mustache_partial_no_single_quote, $.mustache_partial),
@@ -381,6 +382,7 @@ module.exports = grammar({
       ),
     _mustache_node_no_double_quote: ($) =>
       choice(
+        $.mustache_triple,
         $.mustache_interpolation,
         alias($._mustache_comment_no_double_quote, $.mustache_comment),
         alias($._mustache_partial_no_double_quote, $.mustache_partial),

package/package.json

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

package/src/grammar.json

@@ -942,7 +942,7 @@
           "type": "ALIAS",
           "content": {
             "type": "SYMBOL",
-            "name": "_html_attribute_value_no_single_quote"
+            "name": "_html_attribute_value_no_double_quote"
           },
           "named": true,
           "value": "text"
@@ -960,7 +960,7 @@
           "type": "ALIAS",
           "content": {
             "type": "SYMBOL",
-            "name": "_html_attribute_value_no_double_quote"
+            "name": "_html_attribute_value_no_single_quote"
           },
           "named": true,
           "value": "text"
@@ -1158,6 +1158,10 @@
     "_mustache_node_no_single_quote": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "SYMBOL",
+          "name": "mustache_triple"
+        },
         {
           "type": "SYMBOL",
           "name": "mustache_interpolation"
@@ -1203,6 +1207,10 @@
     "_mustache_node_no_double_quote": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "SYMBOL",
+          "name": "mustache_triple"
+        },
         {
           "type": "SYMBOL",
           "name": "mustache_interpolation"

package/src/node-types.json

@@ -326,6 +326,10 @@
         {
           "type": "mustache_section",
           "named": true
+        },
+        {
+          "type": "mustache_triple",
+          "named": true
         }
       ]
     }