mark function curry kind in value mismatch

Author: tsnobip

jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_curried_mode.res.expected

@@ -19,9 +19,9 @@
   let add: (. int, int) => int
 }
   Values do not match:
-    let add: (int, int) => int
+    let add: (int, int) => int (curried)
   is not included in
-    let add: (. int, int) => int
+    let add: (. int, int) => int (uncurried)
   /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:2:3-30:
     Expected declaration
   /.../fixtures/curried_value_instead_of_uncurried_in_curried_mode.res:4:7-9:

jscomp/build_tests/super_errors/expected/curried_value_instead_of_uncurried_in_uncurried_mode.res.expected

@@ -13,16 +13,16 @@
   Signature mismatch:
   Modules do not match:
     {
-  let add: (. int, int) => int
+  let add: (int, int) => int
 }
   is not included in
     {
   let add: (int, int) => int
 }
   Values do not match:
-    let add: (. int, int) => int
+    let add: (int, int) => int (curried)
   is not included in
-    let add: (int, int) => int
+    let add: (int, int) => int (uncurried)
   /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:4:3-28:
     Expected declaration
   /.../fixtures/curried_value_instead_of_uncurried_in_uncurried_mode.res:7:7-9:

jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_curried_mode.res.expected

@@ -19,9 +19,9 @@
   let add: (int, int) => int
 }
   Values do not match:
-    let add: (. int, int) => int
+    let add: (. int, int) => int (uncurried)
   is not included in
-    let add: (int, int) => int
+    let add: (int, int) => int (curried)
   /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:2:3-28:
     Expected declaration
   /.../fixtures/uncurried_value_instead_of_curried_in_curried_mode.res:4:7-9:

jscomp/build_tests/super_errors/expected/uncurried_value_instead_of_curried_in_uncurried_mode.res.expected

@@ -16,12 +16,12 @@
 }
   is not included in
     {
-  let add: (. int, int) => int
+  let add: (int, int) => int
 }
   Values do not match:
-    let add: (int, int) => int
+    let add: (int, int) => int (uncurried)
   is not included in
-    let add: (. int, int) => int
+    let add: (int, int) => int (curried)
   /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:5:3-30:
     Expected declaration
   /.../fixtures/uncurried_value_instead_of_curried_in_uncurried_mode.res:7:7-9:

jscomp/ml/includemod.ml

@@ -537,6 +537,20 @@ let include_err ppf = function
   | Missing_field (id, loc, kind) ->
       fprintf ppf "The %s `%a' is required but not provided" kind ident id;
       show_loc "Expected declaration" ppf loc
+  | Value_descriptions(id, 
+      ({ val_type = { desc = Tlink { desc = Tconstr (Pident {name = "function$"},_,_) }}} as d1), 
+      ({ val_type = { desc = Tarrow _ }} as d2)) ->
+          fprintf ppf
+            "@[<hv 2>Values do not match:@ %a (uncurried)@;<1 -2>is not included in@ %a (curried)@]"
+            (value_description id) d1 (value_description id) d2;
+          show_locs ppf (d1.val_loc, d2.val_loc)
+  | Value_descriptions(id, 
+      ({ val_type = { desc = Tlink { desc = Tarrow _ }}} as d1), 
+      ({ val_type = { desc = Tconstr (Pident {name = "function$"},_,_)}} as d2)) ->
+          fprintf ppf
+            "@[<hv 2>Values do not match:@ %a (curried)@;<1 -2>is not included in@ %a (uncurried)@]"
+            (value_description id) d1 (value_description id) d2;
+          show_locs ppf (d1.val_loc, d2.val_loc)
   | Value_descriptions(id, d1, d2) ->
       fprintf ppf
         "@[<hv 2>Values do not match:@ %a@;<1 -2>is not included in@ %a@]"

jscomp/syntax/src/res_uncurried.ml

@@ -8,4 +8,4 @@ let fromDotted ~dotted = function
 let getDotted ~uncurried = function
   | Config.Legacy -> uncurried
   | Swap -> not uncurried
-  | Uncurried -> not uncurried
+  | Uncurried -> false