add fix, but that changes list parsing slightly

Author: zth

jscomp/syntax/src/res_grammar.ml

@@ -171,7 +171,8 @@ let is_structure_item_start = function
 let is_pattern_start = function
   | Token.Int _ | Float _ | String _ | Codepoint _ | Backtick | True | False
   | Minus | Plus | Lparen | Lbracket | Lbrace | List | Dict | Underscore
-  | Lident _ | Uident _ | Hash | Exception | Percent | Module | At ->
+  | DotDotDot | Lident _ | Uident _ | Hash | Exception | Percent | Module | At
+    ->
     true
   | _ -> false
 

jscomp/syntax/tests/parsing/grammar/pattern/expected/variantSpreads.res.txt

@@ -1,24 +1,56 @@
-
-  Syntax error!
-  tests/parsing/grammar/pattern/variantSpreads.res:37:10-12
-
-  35 │ let lookupOpt = (b: option<b>) =>
-  36 │   switch b {
-  37 │   | Some(...a as a) => doWithA(a)
-  38 │   | Some(Four) => Js.log("four")
-  39 │   | Some(Five) => Js.log("five")
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/grammar/pattern/variantSpreads.res:37:10-12
-
-  35 │ let lookupOpt = (b: option<b>) =>
-  36 │   switch b {
-  37 │   | Some(...a as a) => doWithA(a)
-  38 │   | Some(Four) => Js.log("four")
-  39 │   | Some(Five) => Js.log("five")
-
-  Did you forget a `}` here?
-
+type nonrec a =
+  | One 
+  | Two 
+  | Three 
+type nonrec b =
+  | ... of a 
+  | Four 
+  | Five 
+type nonrec c =
+  | Six 
+  | Seven 
+type nonrec d =
+  | ... of b 
+  | ... of c 
+let doWithA =
+  ((Function$
+      (fun (a : a) ->
+         ((match a with
+           | One -> Js.log {js|aaa|js}
+           | Two -> Js.log {js|twwwoooo|js}
+           | Three -> Js.log {js|threeeee|js})
+         [@res.braces ])))
+  [@res.arity 1])
+let doWithB =
+  ((Function$
+      (fun (b : b) ->
+         ((match b with
+           | One -> Js.log {js|aaa|js}
+           | _ -> Js.log {js|twwwoooo|js})
+         [@res.braces ])))
+  [@res.arity 1])
+let lookup =
+  ((Function$
+      (fun (b : b) ->
+         match b with
+         | ((#a)[@res.patVariantSpread ]) as a -> doWithA a
+         | Four -> Js.log {js|four|js}
+         | Five -> Js.log {js|five|js}))
+  [@res.arity 1])
+let lookup2 =
+  ((Function$
+      (fun (d : d) ->
+         match d with
+         | ((#a)[@res.patVariantSpread ]) as a -> doWithA a
+         | ((#b)[@res.patVariantSpread ]) as b -> doWithB b
+         | Six|Seven -> Js.log {js|Got rest of d|js}))
+  [@res.arity 1])
+let lookupOpt =
+  ((Function$
+      (fun (b : b option) ->
+         match b with
+         | Some (((#a)[@res.patVariantSpread ]) as a) -> doWithA a
+         | Some (Four) -> Js.log {js|four|js}
+         | Some (Five) -> Js.log {js|five|js}
+         | None -> Js.log {js|None|js}))
+  [@res.arity 1])

jscomp/syntax/tests/parsing/recovery/pattern/expected/list.res.txt

@@ -24,16 +24,17 @@
 
 
   Syntax error!
-  tests/parsing/recovery/pattern/list.res:4:13
+  tests/parsing/recovery/pattern/list.res:4:9-11
 
   2 │ | list{} => ()
   3 │ | list{1, list{} => ()
   4 │ | list{}...1, ...list{3, 4} => ()
   5 │ }
   6 │ 
 
-  I'm not sure what to parse here when looking at ",".
+  Did you forget a `}` here?
 
-;;match x with | [] -> () | 1::[]::[] -> () | [] -> 1
+;;match x with | [] -> () | 1::[]::[] -> () | [] -> [%rescript.exprhole ]
+;;1
 ;;[3; 4]
 ;;()