fix: ctrl_do_parenthesized associativity

nushell · Dec 21, 2024 · afef898 · afef898
1 parent 0921525
commit afef898
Show file tree

Hide file tree

Showing 4 changed files with 30,898 additions and 30,903 deletions.
diff --git a/grammar.js b/grammar.js
@@ -45,6 +45,7 @@ module.exports = grammar({
     [$.block, $.val_closure],
     [$.block, $.val_record],
     [$.command, $.record_entry],
+    [$.ctrl_do_parenthesized],
     [$.ctrl_if_parenthesized],
     [$.ctrl_try_parenthesized],
     [$.expr_binary_parenthesized],
@@ -322,12 +323,6 @@ module.exports = grammar({
 
     /// Controls
 
-    _control: ($) =>
-      prec(
-        STATEMENT_PREC().control,
-        choice($._ctrl_statement, $._ctrl_expression),
-      ),
-
     // control statements cannot be used in pipeline because they
     // do not return values
     _ctrl_statement: ($) =>
@@ -397,26 +392,20 @@ module.exports = grammar({
       ),
 
     ctrl_do: ($) =>
-      prec.left(
-        PREC().low,
-        seq(
-          KEYWORD().do,
-          repeat($._flag),
-          choice($._blosure, $.val_variable),
-          repeat($._do_expression),
-        ),
+      seq(
+        KEYWORD().do,
+        repeat($._flag),
+        choice($._blosure, $.val_variable),
+        repeat($._do_expression),
       ),
 
     ctrl_do_parenthesized: ($) =>
-      prec.left(
-        PREC().low,
-        seq(
-          KEYWORD().do,
-          repeat($._flags_parenthesized),
-          repeat1($._separator),
-          choice($._blosure, $.val_variable),
-          repeat(seq(repeat($._newline), $._do_expression)),
-        ),
+      seq(
+        KEYWORD().do,
+        repeat($._flags_parenthesized),
+        repeat1($._separator),
+        choice($._blosure, $.val_variable),
+        repeat(seq(repeat($._newline), $._do_expression)),
       ),
 
     ctrl_if: _ctrl_if_rule(false),

diff --git a/src/grammar.json b/src/grammar.json
@@ -3311,23 +3311,6 @@
         "value": "[\\p{Punctuation}\\p{Symbol}\\p{XID_Continue}]"
       }
     },
-    "_control": {
-      "type": "PREC",
-      "value": 1,
-      "content": {
-        "type": "CHOICE",
-        "members": [
-          {
-            "type": "SYMBOL",
-            "name": "_ctrl_statement"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "_ctrl_expression"
-          }
-        ]
-      }
-    },
     "_ctrl_statement": {
       "type": "CHOICE",
       "members": [
@@ -3590,103 +3573,95 @@
       ]
     },
     "ctrl_do": {
-      "type": "PREC_LEFT",
-      "value": -1,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "do"
-          },
-          {
-            "type": "REPEAT",
-            "content": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "do"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_flag"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
               "type": "SYMBOL",
-              "name": "_flag"
-            }
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_blosure"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "val_variable"
-              }
-            ]
-          },
-          {
-            "type": "REPEAT",
-            "content": {
+              "name": "_blosure"
+            },
+            {
               "type": "SYMBOL",
-              "name": "_do_expression"
+              "name": "val_variable"
             }
+          ]
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_do_expression"
           }
-        ]
-      }
+        }
+      ]
     },
     "ctrl_do_parenthesized": {
-      "type": "PREC_LEFT",
-      "value": -1,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "do"
-          },
-          {
-            "type": "REPEAT",
-            "content": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "do"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_flags_parenthesized"
+          }
+        },
+        {
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_separator"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
               "type": "SYMBOL",
-              "name": "_flags_parenthesized"
-            }
-          },
-          {
-            "type": "REPEAT1",
-            "content": {
+              "name": "_blosure"
+            },
+            {
               "type": "SYMBOL",
-              "name": "_separator"
+              "name": "val_variable"
             }
-          },
-          {
-            "type": "CHOICE",
+          ]
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
             "members": [
               {
-                "type": "SYMBOL",
-                "name": "_blosure"
+                "type": "REPEAT",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_newline"
+                }
               },
               {
                 "type": "SYMBOL",
-                "name": "val_variable"
+                "name": "_do_expression"
               }
             ]
-          },
-          {
-            "type": "REPEAT",
-            "content": {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SYMBOL",
-                    "name": "_newline"
-                  }
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "_do_expression"
-                }
-              ]
-            }
           }
-        ]
-      }
+        }
+      ]
     },
     "ctrl_if": {
       "type": "SEQ",
@@ -20305,6 +20280,9 @@
       "command",
       "record_entry"
     ],
+    [
+      "ctrl_do_parenthesized"
+    ],
     [
       "ctrl_if_parenthesized"
     ],