@reteps/tree-sitter-htmlmustache 0.0.38 → 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) {

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.38",
+  "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
         }
       ]
     }