Merge pull request #39 from kit494way/fix-pipe-end-of-line

Fix parsing of pipe at the end of line
nushell · Dec 23, 2023 · 7daffc6 · 7daffc6
2 parents a0b80b2 + a0345fb
commit 7daffc6
Show file tree

Hide file tree

Showing 4 changed files with 119,954 additions and 119,808 deletions.
diff --git a/corpus/pipe/pipe.nu b/corpus/pipe/pipe.nu
@@ -77,3 +77,29 @@ echo this
       (command
         (cmd_identifier)
         (val_variable)))))
+
+=====
+pipe-004-end-of-line
+=====
+
+echo this
+| split row "i" |
+  str join
+
+-----
+
+(nu_script
+  (pipeline
+    (pipe_element
+      (command
+        (cmd_identifier)
+        (val_string)))
+    (pipe_element
+      (command
+        (cmd_identifier)
+        (val_string)
+        (val_string)))
+    (pipe_element
+      (command
+        (cmd_identifier)
+        (val_string)))))
diff --git a/grammar.js b/grammar.js
@@ -405,6 +405,7 @@ module.exports = grammar({
         ),
         // Allow for empty pipeline elements like `ls | | print`
         repeat1(seq(optional("\n"), PUNC().pipe)),
+        optional("\n"),
       ),
 
     pipe_element_last: ($) =>

diff --git a/src/grammar.json b/src/grammar.json
@@ -2658,6 +2658,18 @@
               }
             ]
           }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "\n"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },