Fix parsing uncurried type starting with path.

CHANGELOG.md

@@ -60,6 +60,7 @@ These are only breaking changes for unformatted code.
 - Make internal encoding of locations aware of unicode https://github.com/rescript-lang/rescript-compiler/pull/6073
 - Fix issue where `foo(x,_)` in uncurried mode would generate a curried function https://github.com/rescript-lang/rescript-compiler/pull/6082
 - Fix printing of uncurried application when the lhs is a function definition https://github.com/rescript-lang/rescript-compiler/pull/6084
+- Fix parsing uncurried type starting with path https://github.com/rescript-lang/rescript-compiler/pull/6089
 
 #### :nail_care: Polish
 

res_syntax/src/res_core.ml

@@ -4269,15 +4269,11 @@ and parseEs6ArrowType ~attrs p =
           let uncurried =
             p.uncurried_config |> Res_uncurried.fromDotted ~dotted
           in
+          let loc = mkLoc startPos endPos in
+          let tArg = Ast_helper.Typ.arrow ~loc ~attrs argLbl typ t in
           if uncurried && (paramNum = 1 || p.uncurried_config = Legacy) then
-            let loc = mkLoc startPos endPos in
-            let tArg = Ast_helper.Typ.arrow ~loc ~attrs argLbl typ t in
             (paramNum - 1, Ast_uncurried.uncurriedType ~loc ~arity tArg, 1)
-          else
-            ( paramNum - 1,
-              Ast_helper.Typ.arrow ~loc:(mkLoc startPos endPos) ~attrs argLbl
-                typ t,
-              arity + 1 ))
+          else (paramNum - 1, tArg, arity + 1))
         parameters
         (List.length parameters, returnType, returnTypeArity + 1)
     in
@@ -4919,6 +4915,11 @@ and parseTypeEquationOrConstrDecl p =
         let arrowType =
           Ast_helper.Typ.arrow ~loc Asttypes.Nolabel typ returnType
         in
+        let uncurried = p.uncurried_config <> Legacy in
+        let arrowType =
+          if uncurried then Ast_uncurried.uncurriedType ~loc ~arity:1 arrowType
+          else arrowType
+        in
         let typ = parseTypeAlias p arrowType in
         (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
       | _ -> (Some typ, Asttypes.Public, Parsetree.Ptype_abstract))

res_syntax/src/res_printer.ml

@@ -1644,6 +1644,7 @@ and printTypExpr ~(state : State.t) (typExpr : Parsetree.core_type) cmtTbl =
         let needsParens =
           match typ.ptyp_desc with
           | Ptyp_arrow _ -> true
+          | _ when Ast_uncurried.typeIsUncurriedFun typ -> true
           | _ -> false
         in
         let doc = printTypExpr ~state typ cmtTbl in

res_syntax/tests/parsing/grammar/expressions/UncurriedByDefault.res

@@ -50,6 +50,14 @@ let t4 = (. type a b) => (l: list<a>, x: a) => list{x, ...l}
 let t5 = (type a b) => (. l: list<a>, x: a) => list{x, ...l}
 let t6 = (. type a b) => (. l: list<a>, x: a) => list{x, ...l}
 
+type arrowPath1 = (. int) => string
+type arrowPath2 = (. I.t) => string
+type arrowPath3 = int => string
+type arrowPath4 = I.t => string
+type callback1 = (. ReactEvent.Mouse.t) => unit as 'callback
+type callback2 = (. ReactEvent.Mouse.t) => (unit as 'u)
+type callback3 = ((. ReactEvent.Mouse.t) => unit) as 'callback
+
 @@uncurried.swap
 
 let cApp = foo(. 3)
@@ -103,3 +111,11 @@ let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
 let t1 = (. type a b, l: list<a>, x: a) => list{x, ...l}
 let t2 = (type a b, . l: list<a>, x: a) => list{x, ...l}
 let t3 = (. type a b, . l: list<a>, x: a) => list{x, ...l}
+
+type arrowPath1 = int => string
+type arrowPath2 = I.t => string
+type arrowPath3 = (. int) => string
+type arrowPath4 = (. I.t) => string
+type callback1 = ReactEvent.Mouse.t => unit as 'callback
+type callback2 = ReactEvent.Mouse.t => (unit as 'u)
+type callback3 = (ReactEvent.Mouse.t => unit) as 'callback

res_syntax/tests/parsing/grammar/expressions/expected/UncurriedByDefault.res.txt

@@ -76,6 +76,16 @@ let t5 (type a) (type b) =
   ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
 let t6 (type a) (type b) =
   ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
+type nonrec arrowPath1 = (int -> string, [ `Has_arity1 ]) function$
+type nonrec arrowPath2 = (I.t -> string, [ `Has_arity1 ]) function$
+type nonrec arrowPath3 = int -> string
+type nonrec arrowPath4 = I.t -> string
+type nonrec callback1 =
+  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback
+type nonrec callback2 =
+  (ReactEvent.Mouse.t -> unit as 'u, [ `Has_arity1 ]) function$
+type nonrec callback3 =
+  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback
 [@@@uncurried.swap ]
 let cApp = foo 3
 let uApp = ((foo 3)[@res.uapp ])
@@ -151,4 +161,14 @@ let t0 (type a) (type b) =
   ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
 let t1 (type a) (type b) (l : a list) (x : a) = x :: l
 let t2 (type a) (type b) (l : a list) (x : a) = x :: l
-let t3 (type a) (type b) (l : a list) (x : a) = x :: l
+let t3 (type a) (type b) (l : a list) (x : a) = x :: l
+type nonrec arrowPath1 = (int -> string, [ `Has_arity1 ]) function$
+type nonrec arrowPath2 = (I.t -> string, [ `Has_arity1 ]) function$
+type nonrec arrowPath3 = int -> string
+type nonrec arrowPath4 = I.t -> string
+type nonrec callback1 =
+  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback
+type nonrec callback2 =
+  (ReactEvent.Mouse.t -> unit as 'u, [ `Has_arity1 ]) function$
+type nonrec callback3 =
+  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback

res_syntax/tests/printer/expr/UncurriedByDefault.res

@@ -60,6 +60,17 @@ let t6 = (. type a b) => (. l: list<a>, x: a) => list{x, ...l}
 let () = (x => ignore(x))(3)
 let () = ((. x) => ignore(x))(. 3)
 
+type arrowPath1 = (. int) => string
+type arrowPath2 = (. I.t) => string
+type arrowPath3 = int => string
+type arrowPath4 = I.t => string
+type callback1 = ReactEvent.Mouse.t => unit as 'callback
+type callback2 = ReactEvent.Mouse.t => (unit as 'u)
+type callback3 = (ReactEvent.Mouse.t => unit) as 'callback
+type callback4 = (. ReactEvent.Mouse.t) => unit as 'callback
+type callback5 = (. ReactEvent.Mouse.t) => (unit as 'u)
+type callback6 = ((. ReactEvent.Mouse.t) => unit) as 'callback
+
 @@uncurried.swap
 
 let cApp = foo(. 3)
@@ -121,3 +132,14 @@ let t3 = (. type a b, . l: list<a>, x: a) => list{x, ...l}
 
 let () = (x => ignore(x))(3)
 let () = ((. x) => ignore(x))(. 3)
+
+type arrowPath1 = (. int) => string
+type arrowPath2 = (. I.t) => string
+type arrowPath3 = int => string
+type arrowPath4 = I.t => string
+type callback1 = (. ReactEvent.Mouse.t) => unit as 'callback
+type callback2 = (. ReactEvent.Mouse.t) => (unit as 'u)
+type callback3 = ((. ReactEvent.Mouse.t) => unit) as 'callback
+type callback4 = ReactEvent.Mouse.t => unit as 'callback
+type callback5 = ReactEvent.Mouse.t => (unit as 'u)
+type callback6 = (ReactEvent.Mouse.t => unit) as 'callback

res_syntax/tests/printer/expr/expected/UncurriedByDefault.res.txt

@@ -60,6 +60,17 @@ let t6 = (. type a b, l: list<a>, x: a) => list{x, ...l}
 let () = (x => ignore(x))(3)
 let () = ((. x) => ignore(x))(. 3)
 
+type arrowPath1 = (. int) => string
+type arrowPath2 = (. I.t) => string
+type arrowPath3 = int => string
+type arrowPath4 = I.t => string
+type callback1 = (ReactEvent.Mouse.t => unit) as 'callback
+type callback2 = ReactEvent.Mouse.t => (unit as 'u)
+type callback3 = (ReactEvent.Mouse.t => unit) as 'callback
+type callback4 = ((. ReactEvent.Mouse.t) => unit) as 'callback
+type callback5 = (. ReactEvent.Mouse.t) => (unit as 'u)
+type callback6 = ((. ReactEvent.Mouse.t) => unit) as 'callback
+
 @@uncurried.swap
 
 let cApp = foo(. 3)
@@ -121,3 +132,14 @@ let t3 = (. type a b, l: list<a>, x: a) => list{x, ...l}
 
 let () = (x => ignore(x))(3)
 let () = ((. x) => ignore(x))(. 3)
+
+type arrowPath1 = (. int) => string
+type arrowPath2 = (. I.t) => string
+type arrowPath3 = int => string
+type arrowPath4 = I.t => string
+type callback1 = ((. ReactEvent.Mouse.t) => unit) as 'callback
+type callback2 = (. ReactEvent.Mouse.t) => (unit as 'u)
+type callback3 = ((. ReactEvent.Mouse.t) => unit) as 'callback
+type callback4 = (ReactEvent.Mouse.t => unit) as 'callback
+type callback5 = ReactEvent.Mouse.t => (unit as 'u)
+type callback6 = (ReactEvent.Mouse.t => unit) as 'callback