Support automatic conversion to uncurried syntax via @@toUncurried and reformat

CHANGELOG.md

@@ -16,6 +16,8 @@
 
 - Introduce experimental uncurried by default mode. Can be turned on mid-file by adding standalone annotation `@@uncurried`. For experimentation only. https://github.com/rescript-lang/rescript-compiler/pull/5796
 
+- Adding `@@toUncurried` to the file and reformat will convert to uncurried syntax https://github.com/rescript-lang/rescript-compiler/pull/5800
+
 #### :boom: Breaking Change
 
 - Remove support for the legacy Reason syntax. Existing Reason code can be converted to ReScript syntax using ReScript 9 as follows:

lib/4.06.1/unstable/js_compiler.ml

@@ -58330,7 +58330,16 @@ and printAttribute ?(standalone = false) ~state
         ],
       Doc.hardLine )
   | _ ->
-    if id.txt = "uncurried" then state.uncurried_by_default <- true;
+    let id =
+      match id.txt with
+      | "uncurried" ->
+        state.uncurried_by_default <- true;
+        id
+      | "toUncurried" ->
+        state.uncurried_by_default <- true;
+        {id with txt = "uncurried"}
+      | _ -> id
+    in
     ( Doc.group
         (Doc.concat
            [

lib/4.06.1/unstable/js_playground_compiler.ml

@@ -58330,7 +58330,16 @@ and printAttribute ?(standalone = false) ~state
         ],
       Doc.hardLine )
   | _ ->
-    if id.txt = "uncurried" then state.uncurried_by_default <- true;
+    let id =
+      match id.txt with
+      | "uncurried" ->
+        state.uncurried_by_default <- true;
+        id
+      | "toUncurried" ->
+        state.uncurried_by_default <- true;
+        {id with txt = "uncurried"}
+      | _ -> id
+    in
     ( Doc.group
         (Doc.concat
            [

lib/4.06.1/whole_compiler.ml

@@ -113325,7 +113325,16 @@ and printAttribute ?(standalone = false) ~state
         ],
       Doc.hardLine )
   | _ ->
-    if id.txt = "uncurried" then state.uncurried_by_default <- true;
+    let id =
+      match id.txt with
+      | "uncurried" ->
+        state.uncurried_by_default <- true;
+        id
+      | "toUncurried" ->
+        state.uncurried_by_default <- true;
+        {id with txt = "uncurried"}
+      | _ -> id
+    in
     ( Doc.group
         (Doc.concat
            [

res_syntax/src/res_core.ml

@@ -6404,7 +6404,14 @@ and parseStandaloneAttribute p =
   let startPos = p.startPos in
   Parser.expect AtAt p;
   let attrId = parseAttributeId ~startPos p in
-  if attrId.txt = "uncurried" then p.uncurried_by_default <- true;
+  let attrId =
+    match attrId.txt with
+    | "uncurried" ->
+      p.uncurried_by_default <- true;
+      attrId
+    | "toUncurried" -> {attrId with txt = "uncurried"}
+    | _ -> attrId
+  in
   let payload = parsePayload p in
   (attrId, payload)
 

res_syntax/src/res_printer.ml

@@ -5264,7 +5264,16 @@ and printAttribute ?(standalone = false) ~state
         ],
       Doc.hardLine )
   | _ ->
-    if id.txt = "uncurried" then state.uncurried_by_default <- true;
+    let id =
+      match id.txt with
+      | "uncurried" ->
+        state.uncurried_by_default <- true;
+        id
+      | "toUncurried" ->
+        state.uncurried_by_default <- true;
+        {id with txt = "uncurried"}
+      | _ -> id
+    in
     ( Doc.group
         (Doc.concat
            [

res_syntax/tests/printer/expr/ToUncurried.res

@@ -0,0 +1,35 @@
+let cApp = foo(3)
+let uApp = foo(. 3)
+
+let cFun = x => 3
+let uFun = (.x) => 3
+let mixFun = (a, .b, c) => (d, e, f) => (g, .h) => 4
+let bracesFun = (. x) => y => x+y
+let cFun2 = (x, y) => 3
+let uFun2 = (. x, y) => 3
+
+type cTyp = string => int
+type uTyp = (. string) => int
+type mixTyp = (string, .string, string) => (string, string, string) => (string, .string) => int
+type bTyp = (. string) => string => int
+type cTyp2 = (string, string) => int
+type uTyp2 = (.string, string) => int
+
+@@toUncurried
+
+let cApp = foo(3)
+let uApp = foo(. 3)
+
+let cFun = x => 3
+let uFun = (.x) => 3
+let mixFun = (a, .b, c) => (d, e, f) => (g, .h) => 4
+let bracesFun = (. x) => y => x+y
+let cFun2 = (x, y) => 3
+let uFun2 = (. x, y) => 3
+
+type cTyp = string => int
+type uTyp = (. string) => int
+type mixTyp = (string, .string, string) => (string, string, string) => (string, .string) => int
+type bTyp = (. string) => string => int
+type cTyp2 = (string, string) => int
+type uTyp2 = (.string, string) => int

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

@@ -0,0 +1,35 @@
+let cApp = foo(3)
+let uApp = foo(. 3)
+
+let cFun = x => 3
+let uFun = (. x) => 3
+let mixFun = a => (. b, c) => {(d, e, f, g) => (. h) => 4}
+let bracesFun = (. x) => {y => x + y}
+let cFun2 = (x, y) => 3
+let uFun2 = (. x, y) => 3
+
+type cTyp = string => int
+type uTyp = (. string) => int
+type mixTyp = string => (. string, string) => (string, string, string, string) => (. string) => int
+type bTyp = (. string) => string => int
+type cTyp2 = (string, string) => int
+type uTyp2 = (. string, string) => int
+
+@@uncurried
+
+let cApp = foo(. 3)
+let uApp = foo(3)
+
+let cFun = (. x) => 3
+let uFun = x => 3
+let mixFun = (. a) => (b, c) => {(. d, e, f, g) => h => 4}
+let bracesFun = x => {(. y) => x + y}
+let cFun2 = (. x, y) => 3
+let uFun2 = (x, y) => 3
+
+type cTyp = (. string) => int
+type uTyp = string => int
+type mixTyp = (. string) => (string, string) => (. string, string, string, string) => string => int
+type bTyp = string => (. string) => int
+type cTyp2 = (. string, string) => int
+type uTyp2 = (string, string) => int