allow lines to start with | (pipes)

src/compiler/tests/pipe.test.ts

@@ -93,7 +93,6 @@ describe('pipe expressions', () => {
     `).toEvaluateTo(5)
   })
 
-
   test('string literals can be piped', () => {
     expect(`'hey there' | str.to-upper`).toEvaluateTo('HEY THERE')
   })

src/parser/shrimp.grammar

@@ -21,7 +21,7 @@
     ("-" | "+")? $[0-9]+ ("_"? $[0-9]+)* ('.' $[0-9]+ ("_"? $[0-9]+)*)?
   }
   Boolean { "true" | "false" }
-  newlineOrSemicolon { "\n" | ";" }
+  semicolon { ";" }
   eof { @eof }
   space { " " | "\t" }
   Comment { "#" ![\n]* }
@@ -33,6 +33,8 @@
   "|"[@name=operator]
 }
 
+newlineOrSemicolon { newline | semicolon }
+
 end { @specialize[@name=keyword]<Identifier, "end"> }
 while { @specialize[@name=keyword]<Identifier, "while"> }
 if { @specialize[@name=keyword]<Identifier, "if"> }
@@ -45,6 +47,7 @@ import { @specialize[@name=keyword]<Identifier, "import"> }
 null { @specialize[@name=Null]<Identifier, "null"> }
 
 @external tokens tokenizer from "./tokenizer" { Identifier, AssignableIdentifier, Word, IdentifierBeforeDot, CurlyString }
+@external tokens pipeStartsLineTokenizer from "./tokenizer" { newline, pipeStartsLine }
 @external specialize {Identifier} specializeKeyword from "./tokenizer" { Do }
 
 @precedence {
@@ -84,7 +87,7 @@ consumeToTerminator {
 }
 
 PipeExpr {
-  pipeOperand (!pipe "|" pipeOperand)+
+  pipeOperand (!pipe (pipeStartsLine? "|") newlineOrSemicolon* pipeOperand)+
 }
 
 pipeOperand {

src/parser/shrimp.terms.ts

@@ -32,6 +32,8 @@ export const
   Word = 30,
   IdentifierBeforeDot = 31,
   CurlyString = 32,
+  newline = 100,
+  pipeStartsLine = 101,
   Do = 33,
   Comment = 34,
   Program = 35,

src/parser/shrimp.ts

@@ -1,17 +1,17 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 import {LRParser, LocalTokenGroup} from "@lezer/lr"
 import {operatorTokenizer} from "./operatorTokenizer"
-import {tokenizer, specializeKeyword} from "./tokenizer"
+import {tokenizer, pipeStartsLineTokenizer, specializeKeyword} from "./tokenizer"
 import {trackScope} from "./parserScopeContext"
 import {highlighting} from "./highlight"
 const spec_Identifier = {__proto__:null,while:78, null:112, catch:118, finally:124, end:126, if:134, else:140, try:158, throw:162, import:166}
 export const parser = LRParser.deserialize({
   version: 14,
-  states: "=|QYQbOOO!mOpO'#DXO!rOSO'#D`OOQa'#D`'#D`O%mQcO'#DvO(mQcO'#EiOOQ`'#Ew'#EwO)WQRO'#DwO+]QcO'#EgO+vQbO'#DVOOQa'#Dy'#DyO.[QbO'#DzOOQa'#Ei'#EiO.cQcO'#EiO0aQcO'#EhO1fQcO'#EgO1sQRO'#ESOOQ`'#Eg'#EgO2[QbO'#EgO2cQQO'#EfOOQ`'#Ef'#EfOOQ`'#EU'#EUQYQbOOO2nQbO'#D[O2yQbO'#DpO3tQbO'#DSO4oQQO'#D|O3tQbO'#EOO4tQbO'#EQO4|ObO,59sO5XQbO'#DbO5aQWO'#DcOOOO'#Eo'#EoOOOO'#EZ'#EZO5uOSO,59zOOQa,59z,59zOOQ`'#DZ'#DZO6TQbO'#DoOOQ`'#Em'#EmOOQ`'#E^'#E^O6_QbO,5:^OOQa'#Eh'#EhO3tQbO,5:cO3tQbO,5:cO3tQbO,5:cO3tQbO,5:cO3tQbO,59pO3tQbO,59pO3tQbO,59pO3tQbO,59pOOQ`'#EW'#EWO+vQbO,59qO7XQcO'#DvO7`QcO'#EiO7gQRO,59qO7qQQO,59qO7vQQO,59qO8OQQO,59qO8ZQRO,59qO8sQRO,59qO8zQQO'#DQO9PQbO,5:fO9WQQO,5:eOOQa,5:f,5:fO9cQbO,5:fO9mQbO,5:oO9mQbO,5:nO:}QbO,5:gO;UQbO,59lOOQ`,5;Q,5;QO9mQbO'#EVOOQ`-E8S-E8SOOQ`'#EX'#EXO;pQbO'#D]O;{QbO'#D^OOQO'#EY'#EYO;sQQO'#D]O<aQQO,59vO<fQcO'#EhO=cQRO'#EvO>`QRO'#EvOOQO'#Ev'#EvO>gQQO,5:[O>lQRO,59nO>sQRO,59nO:}QbO,5:hO?RQcO,5:jO@aQcO,5:jO@}QcO,5:jOArQbO,5:lOOQ`'#Eb'#EbO4tQbO,5:lOOQa1G/_1G/_OOOO,59|,59|OOOO,59},59}OOOO-E8X-E8XOOQa1G/f1G/fOOQ`,5:Z,5:ZOOQ`-E8[-E8[OOQa1G/}1G/}OCkQcO1G/}OCuQcO1G/}OETQcO1G/}OE_QcO1G/}OElQcO1G/}OOQa1G/[1G/[OF}QcO1G/[OGUQcO1G/[OG]QcO1G/[OH[QcO1G/[OGdQcO1G/[OOQ`-E8U-E8UOHrQRO1G/]OH|QQO1G/]OIRQQO1G/]OIZQQO1G/]OIfQRO1G/]OImQRO1G/]OItQbO,59rOJOQQO1G/]OOQa1G/]1G/]OJWQQO1G0POOQa1G0Q1G0QOJcQbO1G0QOOQO'#E`'#E`OJWQQO1G0POOQa1G0P1G0POOQ`'#Ea'#EaOJcQbO1G0QOJmQbO1G0ZOKXQbO1G0YOKsQbO'#DjOLUQbO'#DjOLiQbO1G0ROOQ`-E8T-E8TOOQ`,5:q,5:qOOQ`-E8V-E8VOLtQQO,59wOOQO,59x,59xOOQO-E8W-E8WOL|QbO1G/bO:}QbO1G/vO:}QbO1G/YOMTQbO1G0SOM`QbO1G0WOM}QbO1G0WOOQ`-E8`-E8`ONUQQO7+$wOOQa7+$w7+$wON^QQO1G/^ONfQQO7+%kOOQa7+%k7+%kONqQbO7+%lOOQa7+%l7+%lOOQO-E8^-E8^OOQ`-E8_-E8_OOQ`'#E['#E[ON{QQO'#E[O! TQbO'#EuOOQ`,5:U,5:UO! hQbO'#DhO! mQQO'#DkOOQ`7+%m7+%mO! rQbO7+%mO! wQbO7+%mO!!PQbO7+$|O!!_QbO7+$|O!!oQbO7+%bO!!wQbO7+$tOOQ`7+%n7+%nO!!|QbO7+%nO!#RQbO7+%nO!#ZQbO7+%rOOQa<<Hc<<HcO!#xQbO7+$xO!$VQQO7+$xOOQa<<IV<<IVOOQa<<IW<<IWOOQ`,5:v,5:vOOQ`-E8Y-E8YO!$_QQO,5:SO:}QbO,5:VOOQ`<<IX<<IXO!$dQbO<<IXOOQ`<<Hh<<HhO!$iQbO<<HhO!$nQbO<<HhO!$vQbO<<HhOOQ`'#E_'#E_O!%RQbO<<H|O!%ZQbO'#DuOOQ`<<H|<<H|O!%cQbO<<H|OOQ`<<H`<<H`OOQ`<<IY<<IYO!%hQbO<<IYOOQO,5:w,5:wO!%mQbO<<HdOOQO-E8Z-E8ZO:}QbO1G/nOOQ`1G/q1G/qOOQ`AN>sAN>sOOQ`AN>SAN>SO!%zQbOAN>SO!&PQbOAN>SOOQ`-E8]-E8]OOQ`AN>hAN>hO!&XQbOAN>hO2yQbO,5:_O:}QbO,5:aOOQ`AN>tAN>tPItQbO'#EWOOQ`7+%Y7+%YOOQ`G23nG23nO!&^QbOG23nP!%^QbO'#DsOOQ`G24SG24SO!&cQQO1G/yOOQ`1G/{1G/{OOQ`LD)YLD)YO:}QbO7+%eOOQ`<<IP<<IP",
+  states: ">xQYQ!SOOOOQ!Q'#Ej'#EjO!pO!bO'#DXO!uOSO'#D`OOQ!R'#D`'#D`O%sQ!TO'#DvO(yQ!TO'#EmOOQ!Q'#Ez'#EzO)gQRO'#DwO+oQ!TO'#EiO,]Q!SO'#DVOOQ!R'#Dy'#DyO.wQ!SO'#DzOOQ!R'#Em'#EmO/OQ!TO'#EmO1SQ!TO'#ElO2bQ!TO'#EiO2oQRO'#ESOOQ!Q'#Ei'#EiO3WQ!SO'#EiO3_QrO'#EhOOQ!Q'#Eh'#EhOOQ!Q'#EU'#EUQYQ!SOOO3pQbO'#D[O3{QbO'#DpO4vQbO'#DSO5qQQO'#D|O4vQbO'#EOO5vQbO'#EQO6OObO,59sO6ZQbO'#DbO6cQWO'#DcOOOO'#Er'#ErOOOO'#EZ'#EZO6wOSO,59zOOQ!R,59z,59zOOQ!Q'#DZ'#DZO7VQbO'#DoOOQ!Q'#Ep'#EpOOQ!Q'#E^'#E^O7aQ!SO,5:^OOQ!R'#El'#ElO4vQbO,5:cO4vQbO,5:cO4vQbO,5:cO4vQbO,5:cO4vQbO,59pO4vQbO,59pO4vQbO,59pO4vQbO,59pOOQ!Q'#EW'#EWO,]Q!SO,59qO8aQ!TO'#DvO8kQ!TO'#EmO8uQsO,59qO9SQQO,59qO9XQrO,59qO9dQrO,59qO9rQsO,59qO:bQsO,59qO:iQrO'#DQO:qQ!SO,5:fO:xQrO,5:eOOQ!R,5:f,5:fO;WQ!SO,5:fO;eQbO,5:oO;eQbO,5:nOYQ!SO,5:gO<uQ!SO,59lOOQ!Q,5;S,5;SOYQ!SO'#EVO=gQQO'#EVOOQ!Q-E8S-E8SOOQ!Q'#EX'#EXO=lQbO'#D]O=wQbO'#D^OOQO'#EY'#EYO=oQQO'#D]O>]QQO,59vO>bQcO'#ElO?_QRO'#EyO@[QRO'#EyOOQO'#Ey'#EyO@cQQO,5:[O@hQRO,59nO@oQRO,59nOYQ!SO,5:hO@}Q!TO,5:jOBcQ!TO,5:jOCVQ!TO,5:jOCdQ!SO,5:lOOQ!Q'#Eb'#EbO5vQbO,5:lOOQ!R1G/_1G/_OOOO,59|,59|OOOO,59},59}OOOO-E8X-E8XOOQ!R1G/f1G/fOOQ!Q,5:Z,5:ZOOQ!Q-E8[-E8[OOQ!R1G/}1G/}OEiQ!TO1G/}OEsQ!TO1G/}OGXQ!TO1G/}OGcQ!TO1G/}OGpQ!TO1G/}OOQ!R1G/[1G/[OIXQ!TO1G/[OI`Q!TO1G/[OIgQ!TO1G/[OJlQ!TO1G/[OInQ!TO1G/[OOQ!Q-E8U-E8UOKSQsO1G/]OKaQQO1G/]OKfQrO1G/]OKqQrO1G/]OLPQsO1G/]OLWQsO1G/]OL_Q!SO,59rOLiQrO1G/]OOQ!R1G/]1G/]OLtQrO1G0POOQ!R1G0Q1G0QOMSQ!SO1G0QOOQp'#E`'#E`OLtQrO1G0POOQ!R1G0P1G0POOQ!Q'#Ea'#EaOMSQ!SO1G0QOMaQ!SO1G0ZONRQ!SO1G0YONsQ!SO'#DjO! XQ!SO'#DjO! iQbO1G0ROOQ!Q-E8T-E8TOYQ!SO,5:qOOQ!Q,5:q,5:qOYQ!SO,5:qOOQ!Q-E8V-E8VO! tQQO,59wOOQO,59x,59xOOQO-E8W-E8WOYQ!SO1G/bOYQ!SO1G/vOYQ!SO1G/YO! |QbO1G0SO!!XQ!SO1G0WO!!|Q!SO1G0WOOQ!Q-E8`-E8`O!#TQrO7+$wOOQ!R7+$w7+$wO!#`QrO1G/^O!#kQrO7+%kOOQ!R7+%k7+%kO!#yQ!SO7+%lOOQ!R7+%l7+%lOOQp-E8^-E8^OOQ!Q-E8_-E8_OOQ!Q'#E['#E[O!$WQrO'#E[O!$fQ!SO'#ExOOQ`,5:U,5:UO!$vQbO'#DhO!${QQO'#DkOOQ!Q7+%m7+%mO!%QQbO7+%mO!%VQbO7+%mOOQ!Q1G0]1G0]OYQ!SO1G0]O!%_Q!SO7+$|O!%pQ!SO7+$|O!%}QbO7+%bO!&VQbO7+$tOOQ!Q7+%n7+%nO!&[QbO7+%nO!&aQbO7+%nO!&iQ!SO7+%rOOQ!R<<Hc<<HcO!'^Q!SO7+$xO!'kQrO7+$xOOQ!R<<IV<<IVOOQ!R<<IW<<IWOOQ!Q,5:v,5:vOOQ!Q-E8Y-E8YO!'vQQO,5:SOYQ!SO,5:VOOQ!Q<<IX<<IXO!'{QbO<<IXOOQ!Q7+%w7+%wOOQ!Q<<Hh<<HhO!(QQbO<<HhO!(VQbO<<HhO!(_QbO<<HhOOQ`'#E_'#E_O!(jQbO<<H|O!(rQbO'#DuOOQ!Q<<H|<<H|O!(zQbO<<H|OOQ!Q<<H`<<H`OOQ!Q<<IY<<IYO!)PQbO<<IYOOQp,5:w,5:wO!)UQ!SO<<HdOOQp-E8Z-E8ZOYQ!SO1G/nOOQ`1G/q1G/qOOQ!QAN>sAN>sOOQ!QAN>SAN>SO!)cQbOAN>SO!)hQbOAN>SOOQ`-E8]-E8]OOQ!QAN>hAN>hO!)pQbOAN>hO3{QbO,5:_OYQ!SO,5:aOOQ!QAN>tAN>tPL_Q!SO'#EWOOQ`7+%Y7+%YOOQ!QG23nG23nO!)uQbOG23nP!(uQbO'#DsOOQ!QG24SG24SO!)zQQO1G/yOOQ`1G/{1G/{OOQ!QLD)YLD)YOYQ!SO7+%eOOQ`<<IP<<IP",
-  stateData: "!&k~O#XOSrOS~OlSOm`On[OoPOpROqgOwiO|[O!WRO!X[O!Y[O!ehO!l[O!qjO!skO!ulO#^XO#_dO#bQO#mYO#nZO~O#`mO~O!TpO#bsO#dnO#eoO~OlyOn[OoPOpROqgO|[O!RuO!WRO!X[O!Y[O!btO!l[O#^XO#bQO#mYO#nZOP#[XQ#[XR#[XS#[XT#[XU#[XW#[XX#[XY#[XZ#[X[#[X]#[X^#[Xd#[Xe#[Xf#[Xg#[Xh#[Xi#[Xj#[Xu!jX!Z!jX#l!jX~O#_!jX#p!jX!]!jX!`!jX!a!jX!h!jX~P#QOlyOn[OoPOpROqgO|[O!RuO!WRO!X[O!Y[O!btO!l[O#^XO#bQO#mYO#nZOP#]XQ#]XR#]XS#]XT#]XU#]XW#]XX#]XY#]XZ#]X[#]X]#]X^#]Xd#]Xe#]Xf#]Xg#]Xh#]Xi#]Xj#]Xu#]X#l#]X~O#_#]X#p#]X!Z#]X!]#]X!`#]X!a#]X!h#]X~P&TOP{OQ{OR|OS|OT!POU!QOW!OOX!OOY!OOZ!OO[!OO]!OO^zOd}Oe}Of}Og}Oh}Oi}Oj!RO~OP{OQ{OR|OS|Od}Oe}Of}Og}Oh}Oi}Ou#ZX~O#_#ZX#p#ZX!]#ZX!`#ZX!a#ZX#l#ZX!h#ZX~P*hOl!UOm`On[OoPOpROqgOwiO|[O!WRO!X[O!Y[O!ehO!l[O!qjO!skO!ulO#^XO#_!SO#bQO#mYO#nZO~OlyOn[OoPOpRO|[O!RuO!WRO!X[O!Y[O!l[O#^XO#_!SO#bQO#mYO#nZO~O#o!aO~P-ZOV!cO#_#]X#p#]X!]#]X!`#]X!a#]X!h#]X~P'VOP#[XQ#[XR#[XS#[XT#[XU#[XW#[XX#[XY#[XZ#[X[#[X]#[X^#[Xd#[Xe#[Xf#[Xg#[Xh#[Xi#[Xj#[Xu#ZX~O#_#ZX#p#ZX!]#ZX!`#ZX!a#ZX#l#ZX!h#ZX~P.|Ou#ZX#_#ZX#p#ZX!]#ZX!`#ZX!a#ZX#l#ZX!h#ZX~OT!POU!QOj!RO~P0zOV!cO_!dO`!dOa!dOb!dOc!dOk!dO~O!Z!eO~P0zOu!hO#_!gO#p!gO~Ol!jO!R!lO!Z!PP~Ol!pOn[OoPOpRO|[O!WRO!X[O!Y[O!l[O#^XO#bQO#mYO#nZO~OlyOn[OoPOpRO|[O!WRO!X[O!Y[O!l[O#^XO#bQO#mYO#nZO~O!Z!wO~Ol!jO!RuO~Ol#OO|#OO#^XO~Ol#PO#^XO~O#b#QO#d#QO#e#QO#f#QO#g#QO#h#QO~O!TpO#b#SO#dnO#eoO~OqgO!b#TO~P3tOqgO!RuO!btOu!fa!Z!fa#_!fa#p!fa#l!fa!]!fa!`!fa!a!fa!h!fa~P3tO#_!SO~P#QO#_!SO~P&TO#_!SO#l#lO~P*hO#l#lO~O#l#lOu#ZX~O!Z!eO#l#lOu#ZX~O#l#lO~P.|OT!POU!QOj!RO#_!SOu#ZX~O#l#lO~P8bOu!hO~O#o#nO~P-ZO!RuO#_#pO#o#rO~O#_#sO#o#nO~P3tOlSOm`On[OoPOpROqgOwiO|[O!WRO!X[O!Y[O!ehO!l[O!qjO!skO!ulO#^XO#bQO#mYO#nZO~O#_#xO~P9mOu!hO#_ta#pta#lta!]ta!`ta!ata!hta~Ol!jO!R!lO!Z!PX~OpRO|$OO!WRO!X$OO!Y$OO#bQO~O!Z$QO~OqgO!RuO!btOT#[XU#[XW#[XX#[XY#[XZ#[X[#[X]#[Xj#[X!Z#[X~P3tOT!POU!QOj!RO!Z#jX~OT!POU!QOW!OOX!OOY!OOZ!OO[!OO]!OOj!RO~O!Z#jX~P=qO!Z$RO~O!Z$SO~P=qOT!POU!QOj!RO!Z$SO~Ou!ra#_!ra#p!ra!]!ra!`!ra!a!ra#l!ra!h!ra~P)WOP{OQ{OR|OS|Od}Oe}Of}Og}Oh}Oi}O~Ou!ra#_!ra#p!ra!]!ra!`!ra!a!ra#l!ra!h!ra~P?oOT!POU!QOj!ROu!ra#_!ra#p!ra!]!ra!`!ra!a!ra#l!ra!h!ra~Ol!jO!RuOu!ta#_!ta#p!ta!]!ta!`!ta!a!ta#l!ta!h!ta~O^zOR!kiS!kid!kie!kif!kig!kih!kii!kiu!ki#_!ki#p!ki#l!ki!]!ki!`!ki!a!ki!h!ki~OP!kiQ!ki~PBdOP{OQ{O~PBdOP{OQ{Od!kie!kif!kig!kih!kii!kiu!ki#_!ki#p!ki#l!ki!]!ki!`!ki!a!ki!h!ki~OR!kiS!ki~PDPOR|OS|O^zO~PDPOR|OS|O~PDPOW!OOX!OOY!OOZ!OO[!OO]!OOTxijxiuxi#_xi#pxi#lxi!Zxi!]xi!`xi!axi!hxi~OU!QO~PEvOU!QO~PFYOUxi~PEvOT!POU!QOjxiuxi#_xi#pxi#lxi!Zxi!]xi!`xi!axi!hxi~OW!OOX!OOY!OOZ!OO[!OO]!OO~PGdO#_!SO#l$YO~P*hO#l$YO~O#l$YOu#ZX~O!Z!eO#l$YOu#ZX~O#l$YO~P.|O#l$YO~P8bOqgO!btO~P-ZO#_!SO#l$YO~O!RuO#_#pO#o$]O~O#_#sO#o$_O~P3tOu!hO#_!wi#p!wi!]!wi!`!wi!a!wi#l!wi!h!wi~Ou!hO#_!vi#p!vi!]!vi!`!vi!a!vi#l!vi!h!vi~Ou!hO!]!^X!`!^X!a!^X!h!^X~O#_$bO!]#iP!`#iP!a#iP!h#iP~P9mO!]$fO!`$gO!a$hO~O!R!lO!Z!Pa~O#_$lO~P9mO!]$fO!`$gO!a$oO~O!RuOu!ti#_!ti#p!ti!]!ti!`!ti!a!ti#l!ti!h!ti~Ol!jO~PM`O#_!SO#l$sO~O#_!SO#lzi~O!RuO#_#pO#o$vO~O#_#sO#o$wO~P3tOu!hO#_$xO~O#_$bO!]#iX!`#iX!a#iX!h#iX~P9mOl$zO~O!Z${O~O!a$|O~O!`$gO!a$|O~Ou!hO!]$fO!`$gO!a%OO~O#_$bO!]#iP!`#iP!a#iP~P9mO!a%VO!h%UO~O!a%XO~O!a%YO~O!`$gO!a%YO~O!RuOu!tq#_!tq#p!tq!]!tq!`!tq!a!tq#l!tq!h!tq~OqgO!btO#lzq~P-ZO#_!SO#lzq~O!Z%_O~O!a%aO~O!a%bO~O!`$gO!a%bO~O!]$fO!`$gO!a%bO~O!a%fO!h%UO~O!Z%iO!e%hO~O!a%fO~O!a%jO~OqgO!btO#lzy~P-ZO!a%mO~O!`$gO!a%mO~O!a%pO~O!a%sO~O!Z%tO~O|!l~",
+  stateData: "!*S~O#ZOSrOS~OlTOmaOn]OoQOpSOqhOwjO|]O!WSO!X]O!Y]O!eiO!l]O!qkO!slO!umO#WPO#_PO#bYO#eRO#pZO#q[O~O#cnO~O!TqO#etO#goO#hpO~OlzOn]OoQOpSOqhO|]O!RvO!WSO!X]O!Y]O!buO!l]O#bYO#eRO#pZO#q[OP#`XQ#`XR#`XS#`XT#`XU#`XW#`XX#`XY#`XZ#`X[#`X]#`X^#`Xd#`Xe#`Xf#`Xg#`Xh#`Xi#`Xj#`Xu!jX!Z!jX#X!jX#o!jX~O#W!jX#_!jX#s!jX!]!jX!`!jX!a!jX!h!jX~P#TOlzOn]OoQOpSOqhO|]O!RvO!WSO!X]O!Y]O!buO!l]O#bYO#eRO#pZO#q[OP#aXQ#aXR#aXS#aXT#aXU#aXW#aXX#aXY#aXZ#aX[#aX]#aX^#aXd#aXe#aXf#aXg#aXh#aXi#aXj#aXu#aX#X#aX#o#aX~O#W#aX#_#aX#s#aX!Z#aX!]#aX!`#aX!a#aX!h#aX~P&^OP|OQ|OR}OS}OT!QOU!ROW!POX!POY!POZ!PO[!PO]!PO^{Od!OOe!OOf!OOg!OOh!OOi!OOj!SO~OP|OQ|OR}OS}Od!OOe!OOf!OOg!OOh!OOi!OOu#]X#X#]X~O#W#]X#_#]X#s#]X!]#]X!`#]X!a#]X#o#]X!h#]X~P*wOl!VOmaOn]OoQOpSOqhOwjO|]O!WSO!X]O!Y]O!eiO!l]O!qkO!slO!umO#WPO#_PO#bYO#eRO#pZO#q[O~OlzOn]OoQOpSO|]O!RvO!WSO!X]O!Y]O!l]O#WPO#_PO#bYO#eRO#pZO#q[O~O#r!bO~P-sOV!dO#W#aX#_#aX#s#aX!]#aX!`#aX!a#aX!h#aX~P'`OP#`XQ#`XR#`XS#`XT#`XU#`XW#`XX#`XY#`XZ#`X[#`X]#`X^#`Xd#`Xe#`Xf#`Xg#`Xh#`Xi#`Xj#`Xu#]X#X#]X~O#W#]X#_#]X#s#]X!]#]X!`#]X!a#]X#o#]X!h#]X~P/lOu#]X#W#]X#X#]X#_#]X#s#]X!]#]X!`#]X!a#]X#o#]X!h#]X~OT!QOU!ROj!SO~P1pOV!dO_!eO`!eOa!eOb!eOc!eOk!eO~O!Z!fO~P1pOu!iO#WPO#X!jO#_PO#s!hO~Ol!lO!R!nO!Z!PP~Ol!rOn]OoQOpSO|]O!WSO!X]O!Y]O!l]O#bYO#eRO#pZO#q[O~OlzOn]OoQOpSO|]O!WSO!X]O!Y]O!l]O#bYO#eRO#pZO#q[O~O!Z!yO~Ol!lO!RvO~Ol#QO|#QO#bYO~Ol#RO#bYO~O#e#SO#g#SO#h#SO#i#SO#j#SO#k#SO~O!TqO#e#UO#goO#hpO~OqhO!b#VO~P4vOqhO!RvO!buOu!fa!Z!fa#W!fa#X!fa#_!fa#s!fa#o!fa!]!fa!`!fa!a!fa!h!fa~P4vO#WPO#_PO~P#TO#WPO#_PO~P&^O#WPO#_PO#o#nO~P*wO#o#nO~O#o#nOu#]X#X#]X~O!Z!fO#o#nOu#]X#X#]X~O#o#nO~P/lOT!QOU!ROj!SO#WPO#_POu#]X#X#]X~O#o#nO~P9yOu!iO#X!jO~O#r#pO~P-sO!RvO#WPO#_PO#r#tO~O#WPO#_PO#r#pO~P4vOlTOmaOn]OoQOpSOqhOwjO|]O!WSO!X]O!Y]O!eiO!l]O!qkO!slO!umO#bYO#eRO#pZO#q[O~Ou!iO#X!jO#Wta#_ta#sta#ota!]ta!`ta!ata!hta~Ou$PO~Ol!lO!R!nO!Z!PX~OpSO|$SO!WSO!X$SO!Y$SO#eRO~O!Z$UO~OqhO!RvO!buOT#`XU#`XW#`XX#`XY#`XZ#`X[#`X]#`Xj#`X!Z#`X~P4vOT!QOU!ROj!SO!Z#mX~OT!QOU!ROW!POX!POY!POZ!PO[!PO]!POj!SO~O!Z#mX~P?mO!Z$VO~O!Z$WO~P?mOT!QOU!ROj!SO!Z$WO~Ou!ra#W!ra#X!ra#_!ra#s!ra!]!ra!`!ra!a!ra#o!ra!h!ra~P)gOu!ra#W!ra#X!ra#_!ra#s!ra!]!ra!`!ra!a!ra#o!ra!h!ra~OP|OQ|OR}OS}Od!OOe!OOf!OOg!OOh!OOi!OO~PAqOT!QOU!ROj!SO~PAqOl!lO!RvOu!ta#W!ta#X!ta#_!ta#s!ta!]!ta!`!ta!a!ta#o!ta!h!ta~O^{OR!kiS!kid!kie!kif!kig!kih!kii!kiu!ki#W!ki#X!ki#_!ki#s!ki#o!ki!]!ki!`!ki!a!ki!h!ki~OP!kiQ!ki~PD[OP|OQ|O~PD[OP|OQ|Od!kie!kif!kig!kih!kii!kiu!ki#W!ki#X!ki#_!ki#s!ki#o!ki!]!ki!`!ki!a!ki!h!ki~OR!kiS!ki~PE}OR}OS}O^{O~PE}OR}OS}O~PE}OW!POX!POY!POZ!PO[!PO]!POTxijxiuxi#Wxi#Xxi#_xi#sxi#oxi!Zxi!]xi!`xi!axi!hxi~OU!RO~PGzOU!RO~PH^OUxi~PGzOT!QOU!ROjxiuxi#Wxi#Xxi#_xi#sxi#oxi!Zxi!]xi!`xi!axi!hxi~OW!POX!POY!POZ!PO[!PO]!PO~PInO#WPO#_PO#o$^O~P*wO#o$^O~O#o$^Ou#]X#X#]X~O!Z!fO#o$^Ou#]X#X#]X~O#o$^O~P/lO#o$^O~P9yOqhO!buO~P-sO#WPO#_PO#o$^O~O!RvO#WPO#_PO#r$aO~O#WPO#_PO#r$cO~P4vOu!iO#X!jO#W!wi#_!wi#s!wi!]!wi!`!wi!a!wi#o!wi!h!wi~Ou!iO#X!jO#W!vi#_!vi#s!vi!]!vi!`!vi!a!vi#o!vi!h!vi~Ou!iO#X!jO!]!^X!`!^X!a!^X!h!^X~O!]#lP!`#lP!a#lP!h#lP~PYO!]$jO!`$kO!a$lO~O!R!nO!Z!Pa~O!]$jO!`$kO!a$uO~O!RvOu!ti#W!ti#X!ti#_!ti#s!ti!]!ti!`!ti!a!ti#o!ti!h!ti~Ol!lO~P!!XO#WPO#_PO#o$yO~O#WPO#_PO#ozi~O!RvO#WPO#_PO#r$|O~O#WPO#_PO#r$}O~P4vOu!iO#WPO#X!jO#_PO~O!]#lX!`#lX!a#lX!h#lX~PYOl%QO~O!Z%RO~O!a%SO~O!`$kO!a%SO~Ou!iO!]$jO!`$kO!a%VO#X!jO~O!]#lP!`#lP!a#lP~PYO!a%^O!h%]O~O!a%`O~O!a%aO~O!`$kO!a%aO~O!RvOu!tq#W!tq#X!tq#_!tq#s!tq!]!tq!`!tq!a!tq#o!tq!h!tq~OqhO!buO#ozq~P-sO#WPO#_PO#ozq~O!Z%fO~O!a%hO~O!a%iO~O!`$kO!a%iO~O!]$jO!`$kO!a%iO~O!a%mO!h%]O~O!Z%pO!e%oO~O!a%mO~O!a%qO~OqhO!buO#ozy~P-sO!a%tO~O!`$kO!a%tO~O!a%wO~O!a%zO~O!Z%{O~O|!l~",
-  goto: "9Z#lPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP#mP$WP$m%k&y'PP(Z(g)a)dP)jP*q*qPPPP*uP+R+kPPP,R#mP,s-^P-b-h-}P.t/x$W$WP$WP$WP$W$W1O1U1b2U2d2n2t2{3R3]3c3m3wPPP4V4Z5O6tPPP8OP8`PPPPP8d8j8praOf!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tQ!YXR#f!TwaOXf!T!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tr_Of!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tQ!]XS!qh%hQ!viQ!zkQ#]!QQ#_!PQ#b!RR#i!TvTOfh!c!d!e!h!w#x$Q$R$S$d$l${%_%h%i%t!W[STZikuxz{|}!O!P!Q!R!U!V!_!b!p#j#o#t$^$t%]%kS!VX!TQ#OmR#PnQ!XXR#e!TrSOf!c!d!e!h!w#x$Q$R$S$d$l${%_%i%t!WySTZikuxz{|}!O!P!Q!R!U!V!_!b!p#j#o#t$^$t%]%kS!UX!TT!ph%hevSTx!U!V!p#j$t%]%kraOf!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tdtSTx!U!V!p#j$t%]%kQ!YXQ#TuR#f!TR!ogX!mg!k!n#}#S[OSTXZfhikuxz{|}!O!P!Q!R!T!U!V!_!b!c!d!e!h!p!w#j#o#t#x$Q$R$S$^$d$l$t${%]%_%h%i%k%tR$O!lTpQrQ$j#yQ$q$TQ%Q$kR%d%RQ#y!eQ$T!wQ$m$RQ$n$SQ%`${Q%l%_Q%r%iR%u%tQ$i#yQ$p$TQ$}$jQ%P$kQ%Z$qS%c%Q%RR%n%ddvSTx!U!V!p#j$t%]%kQ!`Z[!|l!{!}$U$V$rQ#m!_X#p!`#m#q$[vUOXf!T!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tT!sh%hT%S$m%TQ%W$mR%g%TwUOXf!T!c!d!e!h!w#x$Q$R$S$d$l${%_%i%trWOf!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tQ!WXQ!ykQ#V{Q#Y|Q#[}R#d!T#T[OSTXZfhikuxz{|}!O!P!Q!R!T!U!V!_!b!c!d!e!h!p!w#j#o#t#x$Q$R$S$^$d$l$t${%]%_%h%i%k%t![[STZhikuxz{|}!O!P!Q!R!U!V!_!b!p#j#o#t$^$t%]%h%kw]OXf!T!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tQfOR!if^!fc!^#u#v#w$c$kR#z!fQ!TXQ!_Z`#c!T!_#j#k$X$t%]%kS#j!U!VS#k!W!]S$X#d#iQ$t$ZR%]$uQ!kgQ!{lU#|!k!{$VR$V!}Q!ngQ#}!kT$P!n#}QrQR#RrS$d#x$lR$y$dQ$u$ZR%^$uYxST!U!V!pR#UxQ%T$mR%e%TQ#q!`Q$[#mT$`#q$[Q#t!bQ$^#oT$a#t$^Q!}lQ$U!{U$W!}$U$rR$r$VTeOfScOfS!^X!TQ#u!cQ#v!d`#w!e!w$R$S${%_%i%tQ#{!hU$c#x$d$lR$k$QvVOXf!T!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tdtSTx!U!V!p#j$t%]%kQ!bZS!rh%hQ!uiQ!xkQ#TuQ#VzQ#W{Q#X|Q#Z}Q#]!OQ#^!PQ#`!QQ#a!RQ#o!_X#s!b#o#t$^r^Of!c!d!e!h!w#x$Q$R$S$d$l${%_%i%t![ySTZhikuxz{|}!O!P!Q!R!U!V!_!b!p#j#o#t$^$t%]%h%kQ![XR#h!T[wSTx!U!V!pQ$Z#jV%[$t%]%kTqQrQ$e#xR%R$lQ!thR%q%hrbOf!c!d!e!h!w#x$Q$R$S$d$l${%_%i%tQ!ZXR#g!T",
+  goto: "<O#oPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP#pP$^P$v%w'Y'`P(m(y)v)yP*PP+Z+ZPPPP+_P+k,TPPP,k#pP-]-yP-}.T.mP/g0n$^$^P$^P$^P$^$^1w1}2Z3V3e3o3u3|4S4^4d4n4xPPPPP5W5[6WP7j9cPP:pP;QPPPPP;U;[;bxbOg!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{Q!ZYR#h!U}bOYg!U!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{x`Og!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{Q!^YS!si%oQ!xjQ!|lQ#_!RQ#a!QQ#d!SR#k!U|UOgi!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%o%p%{!W]TU[jlvy{|}!O!P!Q!R!S!V!W!`!c!r#l#q#v$b$z%d%rS!WY!UQ#QnR#RoQ!YYR#g!UxTOg!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{!WzTU[jlvy{|}!O!P!Q!R!S!V!W!`!c!r#l#q#v$b$z%d%rS!VY!UT!ri%oewTUy!V!W!r#l$z%d%rxbOg!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{duTUy!V!W!r#l$z%d%rQ!ZYQ#VvR#h!UR!qhX!oh!m!p$R#Y]OTUY[gijlvy{|}!O!P!Q!R!S!U!V!W!`!c!d!e!f!i!r!y#l#q#v#z#}$P$U$V$W$b$h$p$r$z%R%d%f%o%p%r%{R$S!nTqRsQ$n#{Q$w$XQ%X$qR%k%YQ#{!fQ$X!yQ$s$VQ$t$WQ%g%RQ%s%fQ%y%pR%|%{Q$m#{Q$v$XQ%T$nQ%W$qQ%b$wS%j%X%YR%u%kdwTUy!V!W!r#l$z%d%rQ!a[[#Om!}#P$Y$Z$xQ#o!`X#r!a#o#s$`|VOYg!U!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{T!ui%oT%Z$s%[Q%_$sR%n%[}VOYg!U!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{xXOg!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{Q!XYQ!{lQ#X|Q#[}Q#^!OR#f!U#Z]OTUY[gijlvy{|}!O!P!Q!R!S!U!V!W!`!c!d!e!f!i!r!y#l#q#v#z#}$P$U$V$W$b$h$p$r$z%R%d%f%o%p%r%{![]TU[ijlvy{|}!O!P!Q!R!S!V!W!`!c!r#l#q#v$b$z%d%o%r}^OYg!U!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{QgOR!kg^!gd!_#w#x#y$g$qR#|!gQ!UYQ!`[d#e!U!`#l#m#}$]$p$z%d%rS#l!V!WS#m!X!^Q#}!iS$]#f#kQ$p$PQ$z$_R%d${Q!mhQ!}mU$Q!m!}$ZR$Z#PQ!phQ$R!mT$T!p$RQsRR#TsS$h#z$rR%P$hQ${$_R%e${YyTU!V!W!rR#WyQ%[$sR%l%[Q#s!aQ$`#oT$d#s$`Q#v!cQ$b#qT$e#v$bQ#PmQ$Y!}U$[#P$Y$xR$x$ZTfOgSdOgS!_Y!UQ#w!dQ#x!e`#y!f!y$V$W%R%f%p%{Q$O!iU$g#z$h$rS$o#}$PQ$q$UR%U$pSeOg|!TY[!U!V!W!X!^!`!i#f#k#l#m#}$P$]$_$p$z${%d%rQ!hdW#r!a#o#s$`W#u!c#q#v$b`#z!f!y$V$W%R%f%p%{U$f#z$h$rQ$r$UR%O$g|WOYg!U!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{duTUy!V!W!r#l$z%d%rQ!c[S!ti%oQ!wjQ!zlQ#VvQ#X{Q#Y|Q#Z}Q#]!OQ#_!PQ#`!QQ#b!RQ#c!SQ#q!`X#u!c#q#v$bx_Og!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{![zTU[ijlvy{|}!O!P!Q!R!S!V!W!`!c!r#l#q#v$b$z%d%o%rQ!]YR#j!U[xTUy!V!W!rQ$_#lV%c$z%d%rTrRsQ$i#zR%Y$rQ!viR%x%oxcOg!d!e!f!i!y#z#}$P$U$V$W$h$p$r%R%f%p%{Q![YR#i!U",
   nodeNames: "⚠ Star Slash Plus Minus And Or Eq EqEq Neq Lt Lte Gt Gte Modulo PlusEq MinusEq StarEq SlashEq ModuloEq Band Bor Bxor Shl Shr Ushr NullishCoalesce NullishEq Identifier AssignableIdentifier Word IdentifierBeforeDot CurlyString Do Comment Program PipeExpr operator WhileExpr keyword ConditionalOp ParenExpr FunctionCall DotGet Number PositionalArg FunctionDef Params NamedParam NamedArgPrefix String StringFragment Interpolation EscapeSeq DoubleQuote Boolean Null colon CatchExpr keyword Block FinallyExpr keyword keyword Underscore NamedArg IfExpr keyword FunctionCall ElseIfExpr keyword ElseExpr FunctionCallOrIdentifier BinOp Regex Dict Array FunctionCallWithBlock TryExpr keyword Throw keyword Import keyword CompoundAssign Assign",
-  maxTerm: 124,
+  maxTerm: 127,
   context: trackScope,
   nodeProps: [
     ["closedBy", 57,"end"]
@@ -19,9 +19,9 @@ export const parser = LRParser.deserialize({
   propSources: [highlighting],
   skippedNodes: [0,34],
   repeatNodeCount: 13,
-  tokenData: "Lq~R!OOX$RXY$pYZ%ZZp$Rpq$pqr$Rrs%tst'ztu)cuw$Rwx)hxy)myz*Wz{$R{|*q|}$R}!O*q!O!P$R!P!Q4^!Q!R+c!R![.W![!]<y!]!^%Z!^!}$R!}#O=d#O#P?Y#P#Q?_#Q#R$R#R#S?x#S#T$R#T#Y@c#Y#ZA}#Z#b@c#b#cGk#c#f@c#f#gHn#g#h@c#h#iIq#i#o@c#o#p$R#p#qLR#q;'S$R;'S;=`$j<%l~$R~O$R~~LlS$WU!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RS$mP;=`<%l$R^$wU!TS#XYOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%bU!TS#_QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU%yZ!TSOr%trs&lst%ttu'Vuw%twx'Vx#O%t#O#P'V#P;'S%t;'S;=`'t<%lO%tU&sU!WQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RQ'YTOr'Vrs'is;'S'V;'S;=`'n<%lO'VQ'nO!WQQ'qP;=`<%l'VU'wP;=`<%l%t^(RZrY!TSOY'zYZ$RZt'ztu(tuw'zwx(tx#O'z#O#P(t#P;'S'z;'S;=`)]<%lO'zY(ySrYOY(tZ;'S(t;'S;=`)V<%lO(tY)YP;=`<%l(t^)`P;=`<%l'z~)hO#d~~)mO#b~U)tU!TS#^QOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*_U!TS#lQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU*vX!TSOt$Ruw$Rx!Q$R!Q!R+c!R![.W![#O$R#P;'S$R;'S;=`$j<%lO$RU+jb!TS|QOt$Ruw$Rx!O$R!O!P,r!P!Q$R!Q![.W![#O$R#P#R$R#R#S/T#S#U$R#U#V/r#V#c$R#c#d1W#d#l$R#l#m2f#m;'S$R;'S;=`$j<%lO$RU,wW!TSOt$Ruw$Rx!Q$R!Q![-a![#O$R#P;'S$R;'S;=`$j<%lO$RU-hY!TS|QOt$Ruw$Rx!Q$R!Q![-a![#O$R#P#R$R#R#S,r#S;'S$R;'S;=`$j<%lO$RU._[!TS|QOt$Ruw$Rx!O$R!O!P,r!P!Q$R!Q![.W![#O$R#P#R$R#R#S/T#S;'S$R;'S;=`$j<%lO$RU/YW!TSOt$Ruw$Rx!Q$R!Q![.W![#O$R#P;'S$R;'S;=`$j<%lO$RU/wX!TSOt$Ruw$Rx!Q$R!Q!R0d!R!S0d!S#O$R#P;'S$R;'S;=`$j<%lO$RU0kX!TS|QOt$Ruw$Rx!Q$R!Q!R0d!R!S0d!S#O$R#P;'S$R;'S;=`$j<%lO$RU1]W!TSOt$Ruw$Rx!Q$R!Q!Y1u!Y#O$R#P;'S$R;'S;=`$j<%lO$RU1|W!TS|QOt$Ruw$Rx!Q$R!Q!Y1u!Y#O$R#P;'S$R;'S;=`$j<%lO$RU2k[!TSOt$Ruw$Rx!Q$R!Q![3a![!c$R!c!i3a!i#O$R#P#T$R#T#Z3a#Z;'S$R;'S;=`$j<%lO$RU3h[!TS|QOt$Ruw$Rx!Q$R!Q![3a![!c$R!c!i3a!i#O$R#P#T$R#T#Z3a#Z;'S$R;'S;=`$j<%lO$RU4cW!TSOt$Ruw$Rx!P$R!P!Q4{!Q#O$R#P;'S$R;'S;=`$j<%lO$RU5Q^!TSOY5|YZ$RZt5|tu7Puw5|wx7Px!P5|!P!Q$R!Q!}5|!}#O;r#O#P9_#P;'S5|;'S;=`<s<%lO5|U6T^!TS!lQOY5|YZ$RZt5|tu7Puw5|wx7Px!P5|!P!Q9t!Q!}5|!}#O;r#O#P9_#P;'S5|;'S;=`<s<%lO5|Q7UX!lQOY7PZ!P7P!P!Q7q!Q!}7P!}#O8`#O#P9_#P;'S7P;'S;=`9n<%lO7PQ7tP!P!Q7wQ7|U!lQ#Z#[7w#]#^7w#a#b7w#g#h7w#i#j7w#m#n7wQ8cVOY8`Z#O8`#O#P8x#P#Q7P#Q;'S8`;'S;=`9X<%lO8`Q8{SOY8`Z;'S8`;'S;=`9X<%lO8`Q9[P;=`<%l8`Q9bSOY7PZ;'S7P;'S;=`9n<%lO7PQ9qP;=`<%l7PU9yW!TSOt$Ruw$Rx!P$R!P!Q:c!Q#O$R#P;'S$R;'S;=`$j<%lO$RU:jb!TS!lQOt$Ruw$Rx#O$R#P#Z$R#Z#[:c#[#]$R#]#^:c#^#a$R#a#b:c#b#g$R#g#h:c#h#i$R#i#j:c#j#m$R#m#n:c#n;'S$R;'S;=`$j<%lO$RU;w[!TSOY;rYZ$RZt;rtu8`uw;rwx8`x#O;r#O#P8x#P#Q5|#Q;'S;r;'S;=`<m<%lO;rU<pP;=`<%l;rU<vP;=`<%l5|U=QU!TS!ZQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU=kW#nQ!TSOt$Ruw$Rx!_$R!_!`>T!`#O$R#P;'S$R;'S;=`$j<%lO$RU>YV!TSOt$Ruw$Rx#O$R#P#Q>o#Q;'S$R;'S;=`$j<%lO$RU>vU#mQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~?_O#e~U?fU#oQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@PU!TS!bQOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RU@h^!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$RUAkU!RQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$RUBS_!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#UCR#U#o@c#o;'S$R;'S;=`$j<%lO$RUCW`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#`@c#`#aDY#a#o@c#o;'S$R;'S;=`$j<%lO$RUD_`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#g@c#g#hEa#h#o@c#o;'S$R;'S;=`$j<%lO$RUEf`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#X@c#X#YFh#Y#o@c#o;'S$R;'S;=`$j<%lO$RUFo^!XQ!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Gr^#fW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Hu^#hW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#o@c#o;'S$R;'S;=`$j<%lO$R^Ix`#gW!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#f@c#f#gJz#g#o@c#o;'S$R;'S;=`$j<%lO$RUKP`!TSOt$Ruw$Rx}$R}!O@c!O!Q$R!Q![@c![!_$R!_!`Ad!`#O$R#P#T$R#T#i@c#i#jEa#j#o@c#o;'S$R;'S;=`$j<%lO$RULYUuQ!TSOt$Ruw$Rx#O$R#P;'S$R;'S;=`$j<%lO$R~LqO#p~",
+  tokenData: "Ln~R}OX$OXY$mYp$Opq$mqr$Ors%Wst'^tu(uuw$Owx(zxy)Pyz)jz{$O{|*T|}$O}!O*T!O!P$O!P!Q3p!Q!R*u!R![-j![!]<]!]!^<v!^!}$O!}#O=a#O#P?V#P#Q?[#Q#R$O#R#S?u#S#T$O#T#Y@`#Y#ZAz#Z#b@`#b#cGh#c#f@`#f#gHk#g#h@`#h#iIn#i#o@`#o#p$O#p#qLO#q;'S$O;'S;=`$g<%l~$O~O$O~~LiS$TU!TSOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OS$jP;=`<%l$O^$tU!TS#ZYOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OU%]Z!TSOr%Wrs&Ost%Wtu&iuw%Wwx&ix#O%W#O#P&i#P;'S%W;'S;=`'W<%lO%WU&VU!WQ!TSOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OQ&lTOr&irs&{s;'S&i;'S;=`'Q<%lO&iQ'QO!WQQ'TP;=`<%l&iU'ZP;=`<%l%W^'eZrY!TSOY'^YZ$OZt'^tu(Wuw'^wx(Wx#O'^#O#P(W#P;'S'^;'S;=`(o<%lO'^Y(]SrYOY(WZ;'S(W;'S;=`(i<%lO(WY(lP;=`<%l(W^(rP;=`<%l'^~(zO#g~~)PO#e~U)WU!TS#bQOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OU)qU!TS#oQOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OU*YX!TSOt$Ouw$Ox!Q$O!Q!R*u!R![-j![#O$O#P;'S$O;'S;=`$g<%lO$OU*|b!TS|QOt$Ouw$Ox!O$O!O!P,U!P!Q$O!Q![-j![#O$O#P#R$O#R#S.g#S#U$O#U#V/U#V#c$O#c#d0j#d#l$O#l#m1x#m;'S$O;'S;=`$g<%lO$OU,ZW!TSOt$Ouw$Ox!Q$O!Q![,s![#O$O#P;'S$O;'S;=`$g<%lO$OU,zY!TS|QOt$Ouw$Ox!Q$O!Q![,s![#O$O#P#R$O#R#S,U#S;'S$O;'S;=`$g<%lO$OU-q[!TS|QOt$Ouw$Ox!O$O!O!P,U!P!Q$O!Q![-j![#O$O#P#R$O#R#S.g#S;'S$O;'S;=`$g<%lO$OU.lW!TSOt$Ouw$Ox!Q$O!Q![-j![#O$O#P;'S$O;'S;=`$g<%lO$OU/ZX!TSOt$Ouw$Ox!Q$O!Q!R/v!R!S/v!S#O$O#P;'S$O;'S;=`$g<%lO$OU/}X!TS|QOt$Ouw$Ox!Q$O!Q!R/v!R!S/v!S#O$O#P;'S$O;'S;=`$g<%lO$OU0oW!TSOt$Ouw$Ox!Q$O!Q!Y1X!Y#O$O#P;'S$O;'S;=`$g<%lO$OU1`W!TS|QOt$Ouw$Ox!Q$O!Q!Y1X!Y#O$O#P;'S$O;'S;=`$g<%lO$OU1}[!TSOt$Ouw$Ox!Q$O!Q![2s![!c$O!c!i2s!i#O$O#P#T$O#T#Z2s#Z;'S$O;'S;=`$g<%lO$OU2z[!TS|QOt$Ouw$Ox!Q$O!Q![2s![!c$O!c!i2s!i#O$O#P#T$O#T#Z2s#Z;'S$O;'S;=`$g<%lO$OU3uW!TSOt$Ouw$Ox!P$O!P!Q4_!Q#O$O#P;'S$O;'S;=`$g<%lO$OU4d^!TSOY5`YZ$OZt5`tu6cuw5`wx6cx!P5`!P!Q$O!Q!}5`!}#O;U#O#P8q#P;'S5`;'S;=`<V<%lO5`U5g^!TS!lQOY5`YZ$OZt5`tu6cuw5`wx6cx!P5`!P!Q9W!Q!}5`!}#O;U#O#P8q#P;'S5`;'S;=`<V<%lO5`Q6hX!lQOY6cZ!P6c!P!Q7T!Q!}6c!}#O7r#O#P8q#P;'S6c;'S;=`9Q<%lO6cQ7WP!P!Q7ZQ7`U!lQ#Z#[7Z#]#^7Z#a#b7Z#g#h7Z#i#j7Z#m#n7ZQ7uVOY7rZ#O7r#O#P8[#P#Q6c#Q;'S7r;'S;=`8k<%lO7rQ8_SOY7rZ;'S7r;'S;=`8k<%lO7rQ8nP;=`<%l7rQ8tSOY6cZ;'S6c;'S;=`9Q<%lO6cQ9TP;=`<%l6cU9]W!TSOt$Ouw$Ox!P$O!P!Q9u!Q#O$O#P;'S$O;'S;=`$g<%lO$OU9|b!TS!lQOt$Ouw$Ox#O$O#P#Z$O#Z#[9u#[#]$O#]#^9u#^#a$O#a#b9u#b#g$O#g#h9u#h#i$O#i#j9u#j#m$O#m#n9u#n;'S$O;'S;=`$g<%lO$OU;Z[!TSOY;UYZ$OZt;Utu7ruw;Uwx7rx#O;U#O#P8[#P#Q5`#Q;'S;U;'S;=`<P<%lO;UU<SP;=`<%l;UU<YP;=`<%l5`U<dU!TS!ZQOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OU<}U!TS#_QOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OU=hW#qQ!TSOt$Ouw$Ox!_$O!_!`>Q!`#O$O#P;'S$O;'S;=`$g<%lO$OU>VV!TSOt$Ouw$Ox#O$O#P#Q>l#Q;'S$O;'S;=`$g<%lO$OU>sU#pQ!TSOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$O~?[O#h~U?cU#rQ!TSOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OU?|U!TS!bQOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OU@e^!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#o@`#o;'S$O;'S;=`$g<%lO$OUAhU!RQ!TSOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$OUBP_!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#UCO#U#o@`#o;'S$O;'S;=`$g<%lO$OUCT`!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#`@`#`#aDV#a#o@`#o;'S$O;'S;=`$g<%lO$OUD[`!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#g@`#g#hE^#h#o@`#o;'S$O;'S;=`$g<%lO$OUEc`!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#X@`#X#YFe#Y#o@`#o;'S$O;'S;=`$g<%lO$OUFl^!XQ!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#o@`#o;'S$O;'S;=`$g<%lO$O^Go^#iW!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#o@`#o;'S$O;'S;=`$g<%lO$O^Hr^#kW!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#o@`#o;'S$O;'S;=`$g<%lO$O^Iu`#jW!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#f@`#f#gJw#g#o@`#o;'S$O;'S;=`$g<%lO$OUJ|`!TSOt$Ouw$Ox}$O}!O@`!O!Q$O!Q![@`![!_$O!_!`Aa!`#O$O#P#T$O#T#i@`#i#jE^#j#o@`#o;'S$O;'S;=`$g<%lO$OULVUuQ!TSOt$Ouw$Ox#O$O#P;'S$O;'S;=`$g<%lO$O~LnO#s~",
-  tokenizers: [operatorTokenizer, 1, 2, 3, tokenizer, new LocalTokenGroup("[~RP!O!PU~ZO#`~~", 11)],
+  tokenizers: [operatorTokenizer, 1, 2, 3, tokenizer, pipeStartsLineTokenizer, new LocalTokenGroup("[~RP!O!PU~ZO#c~~", 11)],
   topRules: {"Program":[0,35]},
   specialized: [{term: 28, get: (value: any, stack: any) => (specializeKeyword(value, stack) << 1), external: specializeKeyword},{term: 28, get: (value: keyof typeof spec_Identifier) => spec_Identifier[value] || -1}],
-  tokenPrec: 2370
+  tokenPrec: 2531
 })

src/parser/tests/pipes.test.ts

@@ -1,4 +1,5 @@
 import { expect, describe, test } from 'bun:test'
+import { parser } from '../shrimp'
 
 import '../shrimp.grammar' // Importing this so changes cause it to retest!
 
@@ -176,3 +177,159 @@ describe('pipe expressions', () => {
       `)
   })
 })
+
+describe('pipe continuation', () => {
+  test('pipe on next line', () => {
+    expect(`hello
+| echo`).toMatchTree(`
+      PipeExpr
+        FunctionCallOrIdentifier
+          Identifier hello
+        operator |
+        FunctionCallOrIdentifier
+          Identifier echo
+    `)
+
+    expect(`echo hello
+| grep h`).toMatchTree(`
+      PipeExpr
+        FunctionCall
+          Identifier echo
+          PositionalArg
+            Identifier hello
+        operator |
+        FunctionCall
+          Identifier grep
+          PositionalArg
+            Identifier h
+    `)
+  })
+
+  test('pipe on next non-empty line', () => {
+    expect(`hello
+
+
+| echo`).toMatchTree(`
+      PipeExpr
+        FunctionCallOrIdentifier
+          Identifier hello
+        operator |
+        FunctionCallOrIdentifier
+          Identifier echo
+    `)
+  })
+
+  test('multi-line pipe chain', () => {
+    expect(`echo hello
+| grep h
+| sort`).toMatchTree(`
+      PipeExpr
+        FunctionCall
+          Identifier echo
+          PositionalArg
+            Identifier hello
+        operator |
+        FunctionCall
+          Identifier grep
+          PositionalArg
+            Identifier h
+        operator |
+        FunctionCallOrIdentifier
+          Identifier sort
+    `)
+  })
+
+  test('pipe with indentation', () => {
+    expect(`echo hello
+  | grep h
+  | sort`).toMatchTree(`
+      PipeExpr
+        FunctionCall
+          Identifier echo
+          PositionalArg
+            Identifier hello
+        operator |
+        FunctionCall
+          Identifier grep
+          PositionalArg
+            Identifier h
+        operator |
+        FunctionCallOrIdentifier
+          Identifier sort
+    `)
+  })
+
+  test('pipe after operand on next line (trailing pipe style)', () => {
+    expect(`echo hello |
+grep h`).toMatchTree(`
+      PipeExpr
+        FunctionCall
+          Identifier echo
+          PositionalArg
+            Identifier hello
+        operator |
+        FunctionCall
+          Identifier grep
+          PositionalArg
+            Identifier h
+    `)
+  })
+
+  test('same-line pipes still work', () => {
+    expect('echo hello | grep h | sort').toMatchTree(`
+      PipeExpr
+        FunctionCall
+          Identifier echo
+          PositionalArg
+            Identifier hello
+        operator |
+        FunctionCall
+          Identifier grep
+          PositionalArg
+            Identifier h
+        operator |
+        FunctionCallOrIdentifier
+          Identifier sort
+    `)
+  })
+
+  test('lots of pipes', () => {
+    expect(`
+'this should help readability in long chains' 
+  | split ' ' 
+  | map (ref str.to-upper) 
+  | join '-' 
+  | echo
+`).toMatchTree(`
+  PipeExpr
+    String
+      StringFragment this should help readability in long chains
+    operator |
+    FunctionCall
+      Identifier split
+      PositionalArg
+        String
+          StringFragment  
+    operator |
+    FunctionCall
+      Identifier map
+      PositionalArg
+        ParenExpr
+          FunctionCall
+            Identifier ref
+            PositionalArg
+              DotGet
+                IdentifierBeforeDot str
+                Identifier to-upper
+    operator |
+    FunctionCall
+      Identifier join
+      PositionalArg
+        String
+          StringFragment -
+    operator |
+    FunctionCallOrIdentifier
+      Identifier echo
+  `)
+  })
+})

src/parser/tokenizer.ts

@@ -1,5 +1,5 @@
 import { ExternalTokenizer, InputStream, Stack } from '@lezer/lr'
-import { Identifier, AssignableIdentifier, Word, IdentifierBeforeDot, Do, CurlyString } from './shrimp.terms'
+import { Identifier, AssignableIdentifier, Word, IdentifierBeforeDot, Do, CurlyString, newline, pipeStartsLine } from './shrimp.terms'
 
 // doobie doobie do (we need the `do` keyword to know when we're defining params)
 export function specializeKeyword(ident: string) {
@@ -346,3 +346,34 @@ const isEmojiOrUnicode = (ch: number): boolean => {
 }
 
 const getCharSize = (ch: number) => (ch > 0xffff ? 2 : 1) // emoji takes 2 UTF-16 code units
+
+export const pipeStartsLineTokenizer = new ExternalTokenizer((input: InputStream, stack: Stack) => {
+  const ch = input.peek(0)
+
+  if (ch !== 10 /* \n */) return
+
+  // ignore whitespace
+  let offset = 1
+  let lastNewlineOffset = 0
+
+  while (true) {
+    const ch = input.peek(offset)
+    if (ch === 10 /* \n */) {
+      lastNewlineOffset = offset
+      offset++
+    } else if (isWhiteSpace(ch)) {
+      offset++
+    } else {
+      break
+    }
+  }
+
+  // look for pipe after skipping empty lines
+  if (input.peek(offset) === 124 /* | */) {
+    input.advance(lastNewlineOffset + 1)
+    input.acceptToken(pipeStartsLine)
+  } else {
+    input.advance(1)
+    input.acceptToken(newline)
+  }
+})