fix: _comment_action rule

ngalaiko · Jan 13, 2025 · 7684032 · 7684032
1 parent ca52fbf
commit 7684032
Show file tree

Hide file tree

Showing 5 changed files with 6,091 additions and 5,441 deletions.
diff --git a/make_grammar.js b/make_grammar.js
@@ -107,7 +107,16 @@ module.exports = function make_grammar(dialect) {
                 ),
 
             _comment_action: ($) =>
-                seq($._left_delimiter, $.comment, $._right_delimiter),
+                choice(
+                    seq(token('{{'), $.comment, token.immediate('}}')),
+                    seq(
+                        token('{{-'),
+                        token.immediate(' '),
+                        $.comment,
+                        token.immediate(' '),
+                        token.immediate('-}}')
+                    )
+                ),
 
             _pipeline_action: ($) =>
                 seq($._left_delimiter, $._pipeline, $._right_delimiter),
@@ -435,13 +444,8 @@ module.exports = function make_grammar(dialect) {
                 ),
 
             // http://stackoverflow.com/questions/13014947/regex-to-match-a-c-style-multiline-comment/36328890#36328890
-            comment: ($) =>
-                token(
-                    choice(
-                        seq('//', /.*/),
-                        seq('/*', /[^*]*\*+([^/*][^*]*\*+)*/, '/')
-                    )
-                ),
+            comment: (_) =>
+                token.immediate(seq('/*', /[^*]*\*+([^/*][^*]*\*+)*/, '/')),
 
             _left_delimiter: ($) => choice(token('{{'), token('{{-')),
             _right_delimiter: ($) => choice(token('}}'), token('-}}')),

diff --git a/src/grammar.json b/src/grammar.json
@@ -89,19 +89,67 @@
       }
     },
     "_comment_action": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_left_delimiter"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "comment"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "{{"
+              }
+            },
+            {
+              "type": "SYMBOL",
+              "name": "comment"
+            },
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "}}"
+              }
+            }
+          ]
         },
         {
-          "type": "SYMBOL",
-          "name": "_right_delimiter"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "{{-"
+              }
+            },
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": " "
+              }
+            },
+            {
+              "type": "SYMBOL",
+              "name": "comment"
+            },
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": " "
+              }
+            },
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "-}}"
+              }
+            }
+          ]
         }
       ]
     },
@@ -3434,39 +3482,21 @@
       }
     },
     "comment": {
-      "type": "TOKEN",
+      "type": "IMMEDIATE_TOKEN",
       "content": {
-        "type": "CHOICE",
+        "type": "SEQ",
         "members": [
           {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "//"
-              },
-              {
-                "type": "PATTERN",
-                "value": ".*"
-              }
-            ]
+            "type": "STRING",
+            "value": "/*"
           },
           {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "/*"
-              },
-              {
-                "type": "PATTERN",
-                "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
-              },
-              {
-                "type": "STRING",
-                "value": "/"
-              }
-            ]
+            "type": "PATTERN",
+            "value": "[^*]*\\*+([^/*][^*]*\\*+)*"
+          },
+          {
+            "type": "STRING",
+            "value": "/"
           }
         ]
       }

diff --git a/src/node-types.json b/src/node-types.json
@@ -274,6 +274,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -515,6 +519,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -716,6 +724,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -932,6 +944,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -1066,6 +1082,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -1338,6 +1358,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -1472,6 +1496,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -2194,6 +2222,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false
@@ -2410,6 +2442,10 @@
         "multiple": true,
         "required": false,
         "types": [
+          {
+            "type": " ",
+            "named": false
+          },
           {
             "type": "-}}",
             "named": false