fix: _comment_action rule

ngalaiko · Jan 14, 2025 · d015e71 · d015e71
1 parent ca52fbf
commit d015e71
Show file tree

Hide file tree

Showing 8 changed files with 12,252 additions and 10,907 deletions.
diff --git a/dialects/helm/src/grammar.json b/dialects/helm/src/grammar.json
@@ -92,16 +92,70 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_left_delimiter"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "{{"
+              }
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "TOKEN",
+                  "content": {
+                    "type": "STRING",
+                    "value": "{{-"
+                  }
+                },
+                {
+                  "type": "IMMEDIATE_TOKEN",
+                  "content": {
+                    "type": "STRING",
+                    "value": " "
+                  }
+                }
+              ]
+            }
+          ]
         },
         {
           "type": "SYMBOL",
           "name": "comment"
         },
         {
-          "type": "SYMBOL",
-          "name": "_right_delimiter"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "}}"
+              }
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "IMMEDIATE_TOKEN",
+                  "content": {
+                    "type": "STRING",
+                    "value": " "
+                  }
+                },
+                {
+                  "type": "IMMEDIATE_TOKEN",
+                  "content": {
+                    "type": "STRING",
+                    "value": "-}}"
+                  }
+                }
+              ]
+            }
+          ]
         }
       ]
     },
@@ -3434,39 +3488,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/dialects/helm/src/node-types.json b/dialects/helm/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