Move non-parametric rules from block_body_rules

Move pipe_element and pipe_element_last away from block_body_rules because they do not depend on terminator parameter
nushell · Aug 25, 2023 · 29f5222 · 29f5222
1 parent e6d2a14
commit 29f5222
Show file tree

Hide file tree

Showing 3 changed files with 47,726 additions and 47,724 deletions.
diff --git a/grammar.js b/grammar.js
@@ -422,6 +422,28 @@ module.exports = grammar({
             KEYWORD().return,
         ),
 
+        /// Pipelines
+
+        pipe_element: $ => seq(
+            choice(
+                prec.right(69, $._expression),
+                $._ctrl_expression,
+                $.where_command,
+                $.command,
+            ),
+            // Allow for empty pipeline elements like `ls | | print`
+            repeat1(seq(
+                optional('\n'),
+                PUNC().pipe,
+            )),
+        ),
+
+        pipe_element_last: $ => choice(
+            prec.right(69, $._expression),
+            $._ctrl_expression,
+            $.where_command,
+            $.command,
+        ),
 
         /// Scope Statements
 
@@ -955,6 +977,7 @@ function block_body_rules(suffix, terminator) {
             return alias($[rule_name + suffix], $[rule_name])
         }
     }
+
     return {
         ['_block_body_statement' + suffix]: $ => choice(
             $['_declaration' + suffix],
@@ -1026,27 +1049,6 @@ function block_body_rules(suffix, terminator) {
             alias($.pipe_element_last, $.pipe_element),
             terminator($),
         )),
-
-        pipe_element: $ => seq(
-            choice(
-                prec.right(69, $._expression),
-                $._ctrl_expression,
-                $.where_command,
-                $.command,
-            ),
-            // Allow for empty pipeline elements like `ls | | print`
-            repeat1(seq(
-                optional('\n'),
-                PUNC().pipe,
-            )),
-        ),
-
-        pipe_element_last: $ => choice(
-            prec.right(69, $._expression),
-            $._ctrl_expression,
-            $.where_command,
-            $.command,
-        ),
     }
 }
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -302,85 +302,6 @@
         ]
       }
     },
-    "pipe_element": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "PREC_RIGHT",
-              "value": 69,
-              "content": {
-                "type": "SYMBOL",
-                "name": "_expression"
-              }
-            },
-            {
-              "type": "SYMBOL",
-              "name": "_ctrl_expression"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "where_command"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "command"
-            }
-          ]
-        },
-        {
-          "type": "REPEAT1",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "\n"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": "|"
-              }
-            ]
-          }
-        }
-      ]
-    },
-    "pipe_element_last": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "PREC_RIGHT",
-          "value": 69,
-          "content": {
-            "type": "SYMBOL",
-            "name": "_expression"
-          }
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_ctrl_expression"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "where_command"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "command"
-        }
-      ]
-    },
     "_block_body_statement_last": {
       "type": "CHOICE",
       "members": [
@@ -2662,6 +2583,85 @@
         }
       ]
     },
+    "pipe_element": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "PREC_RIGHT",
+              "value": 69,
+              "content": {
+                "type": "SYMBOL",
+                "name": "_expression"
+              }
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_ctrl_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "where_command"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "command"
+            }
+          ]
+        },
+        {
+          "type": "REPEAT1",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "\n"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "STRING",
+                "value": "|"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "pipe_element_last": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "PREC_RIGHT",
+          "value": 69,
+          "content": {
+            "type": "SYMBOL",
+            "name": "_expression"
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_ctrl_expression"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "where_command"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "command"
+        }
+      ]
+    },
     "stmt_source": {
       "type": "SEQ",
       "members": [