Merge pull request #17 from qvalentin/fix/selector-expressions

fix: don't allow whitespace between selector-expressions
ngalaiko · May 17, 2024 · 9d3f6e5 · 9d3f6e5
2 parents 17144a7 + 39f5bcc
commit 9d3f6e5
Show file tree

Hide file tree

Showing 9 changed files with 8,318 additions and 8,030 deletions.
diff --git a/dialects/helm/src/grammar.json b/dialects/helm/src/grammar.json
@@ -906,13 +906,33 @@
             "type": "FIELD",
             "name": "operand",
             "content": {
-              "type": "SYMBOL",
-              "name": "_pipeline"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "parenthesized_pipeline"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "field"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "variable"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "selector_expression"
+                }
+              ]
             }
           },
           {
-            "type": "STRING",
-            "value": "."
+            "type": "IMMEDIATE_TOKEN",
+            "content": {
+              "type": "STRING",
+              "value": "."
+            }
           },
           {
             "type": "FIELD",

diff --git a/dialects/helm/src/node-types.json b/dialects/helm/src/node-types.json
@@ -1794,81 +1794,21 @@
         "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "assignment",
-            "named": true
-          },
-          {
-            "type": "chained_pipeline",
-            "named": true
-          },
-          {
-            "type": "dot",
-            "named": true
-          },
-          {
-            "type": "false",
-            "named": true
-          },
           {
             "type": "field",
             "named": true
           },
-          {
-            "type": "float_literal",
-            "named": true
-          },
-          {
-            "type": "function_call",
-            "named": true
-          },
-          {
-            "type": "imaginary_literal",
-            "named": true
-          },
-          {
-            "type": "int_literal",
-            "named": true
-          },
-          {
-            "type": "interpreted_string_literal",
-            "named": true
-          },
-          {
-            "type": "method_call",
-            "named": true
-          },
-          {
-            "type": "nil",
-            "named": true
-          },
           {
             "type": "parenthesized_pipeline",
             "named": true
           },
-          {
-            "type": "raw_string_literal",
-            "named": true
-          },
-          {
-            "type": "rune_literal",
-            "named": true
-          },
           {
             "type": "selector_expression",
             "named": true
           },
-          {
-            "type": "true",
-            "named": true
-          },
           {
             "type": "variable",
             "named": true
-          },
-          {
-            "type": "variable_definition",
-            "named": true
           }
         ]
       }