Fix extra whitespace got deleted by editor and run ocamlformat

Author: shulhi

jscomp/syntax/src/res_core.ml

@@ -3937,28 +3937,32 @@ and parseArrayExp p =
       [] exprs
   in
   let listExprsRev =
-    parseCommaDelimitedReversedList p ~grammar:Grammar.ExprList ~closing:Rbracket
-      ~f:parseSpreadExprRegionWithLoc
+    parseCommaDelimitedReversedList p ~grammar:Grammar.ExprList
+      ~closing:Rbracket ~f:parseSpreadExprRegionWithLoc
   in
   Parser.expect Rbracket p;
   let loc = mkLoc startPos p.prevEndPos in
-  let collectExprs = function 
+  let collectExprs = function
     | [], Some spread, _startPos, _endPos -> [spread]
-    | exprs, Some spread, _startPos, _endPos -> (
+    | exprs, Some spread, _startPos, _endPos ->
+      let els = Ast_helper.Exp.array ~loc exprs in
+      [els; spread]
+    | exprs, None, _startPos, _endPos ->
       let els = Ast_helper.Exp.array ~loc exprs in
-      [els; spread])
-    | exprs, None, _startPos, _endPos -> (
-      let els = Ast_helper.Exp.array ~loc exprs
-      in [els])
+      [els]
   in
   match split_by_spread listExprsRev with
   | [] -> Ast_helper.Exp.array ~loc:(mkLoc startPos p.prevEndPos) []
-  | [(exprs, None, _, _)] -> Ast_helper.Exp.array ~loc:(mkLoc startPos p.prevEndPos) exprs
+  | [(exprs, None, _, _)] ->
+    Ast_helper.Exp.array ~loc:(mkLoc startPos p.prevEndPos) exprs
   | exprs ->
     let xs = List.map collectExprs exprs in
-    let listExprs = List.fold_right (fun exprs1 acc -> 
-      List.fold_right (fun expr1 acc1 -> expr1::acc1) exprs1 acc
-    ) xs [] in
+    let listExprs =
+      List.fold_right
+        (fun exprs1 acc ->
+          List.fold_right (fun expr1 acc1 -> expr1 :: acc1) exprs1 acc)
+        xs []
+    in
     Ast_helper.Exp.apply ~loc
       (Ast_helper.Exp.ident ~loc ~attrs:[spreadAttr]
          (Location.mkloc

jscomp/syntax/tests/parsing/errors/other/expected/spread.res.txt

@@ -1,9 +1,9 @@
 
   Syntax error!
-  jscomp/syntax/tests/parsing/errors/other/spread.res:1:6-8
+  tests/parsing/errors/other/spread.res:1:6-8
 
   1 │ let [...arr, _] = [1, 2, 3]
-  2 │
+  2 │ 
   3 │ let record = {...x, ...y}
 
   Array's `...` spread is not supported in pattern matches.
@@ -12,25 +12,25 @@ Solution: if it's to validate the first few elements, use a `when` clause + Arra
 
 
   Syntax error!
-  jscomp/syntax/tests/parsing/errors/other/spread.res:3:21-23
+  tests/parsing/errors/other/spread.res:3:21-23
 
   1 │ let [...arr, _] = [1, 2, 3]
-  2 │
+  2 │ 
   3 │ let record = {...x, ...y}
   4 │ let {...x, ...y} = myRecord
-  5 │
+  5 │ 
 
   Records can only have one `...` spread, at the beginning.
 Explanation: since records have a known, fixed shape, a spread like `{a, ...b}` wouldn't make sense, as `b` would override every field of `a` anyway.
 
 
   Syntax error!
-  jscomp/syntax/tests/parsing/errors/other/spread.res:4:15-18
+  tests/parsing/errors/other/spread.res:4:15-18
 
-  2 │
+  2 │ 
   3 │ let record = {...x, ...y}
   4 │ let {...x, ...y} = myRecord
-  5 │
+  5 │ 
   6 │ let list{...x, ...y} = myList
 
   Record's `...` spread is not supported in pattern matches.
@@ -39,26 +39,26 @@ Solution: you need to pull out each field you want explicitly.
 
 
   Syntax error!
-  jscomp/syntax/tests/parsing/errors/other/spread.res:6:13-22
+  tests/parsing/errors/other/spread.res:6:13-22
 
   4 │ let {...x, ...y} = myRecord
-  5 │
+  5 │ 
   6 │ let list{...x, ...y} = myList
-  7 │
+  7 │ 
   8 │ type t = {...a}
 
   List pattern matches only supports one `...` spread, at the end.
 Explanation: a list spread at the tail is efficient, but a spread in the middle would create new lists; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
 
 
   Syntax error!
-  jscomp/syntax/tests/parsing/errors/other/spread.res:9:20
+  tests/parsing/errors/other/spread.res:9:20
 
-   7 │
+   7 │ 
    8 │ type t = {...a}
    9 │ type t = Foo({...a})
   10 │ type t = option<foo, {...x}>
-  11 │
+  11 │ 
 
   I'm not sure what to parse here when looking at ")".
 
@@ -69,5 +69,5 @@ let x::y = myList
 type nonrec t = {
   ...: a }
 type nonrec t =
-  | Foo of < a  >
-type nonrec t = (foo, < x  > ) option
+  | Foo of < a  >  
+type nonrec t = (foo, < x  > ) option

jscomp/syntax/tests/parsing/grammar/expressions/expected/array.res.txt

@@ -5,4 +5,4 @@ let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5|];y|]
 let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5|];y;[|7|];y|]
 let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5|];(y : int array)|]
 let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5;k|];y|]
-let x = ((Belt.Array.concatMany)[@res.spread ]) [|y|]
+let x = ((Belt.Array.concatMany)[@res.spread ]) [|y|]

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

@@ -1,6 +1,6 @@
 
   Syntax error!
-  jscomp/syntax/tests/parsing/recovery/expression/list.res:6:26-28
+  tests/parsing/recovery/expression/list.res:6:26-28
 
   4 ┆ let rec loop = (items) => {
   5 ┆   switch(items) {
@@ -14,7 +14,7 @@ Solution: if it's to validate the first few elements, use a `when` clause + Arra
 
 
   Syntax error!
-  jscomp/syntax/tests/parsing/recovery/expression/list.res:7:13-15
+  tests/parsing/recovery/expression/list.res:7:13-15
 
   5 ┆ switch(items) {
   6 ┆   | ["-pp", _ppFlag, ...rest] => loop(rest)
@@ -40,4 +40,4 @@ let flags =
         (loop parts) |> (String.concat {js| |js}))
       [@res.braces ])
     else flags)
-  [@res.ternary ])
+  [@res.ternary ])