Merge pull request #4946 from chenglou/more-arity

[Super errors] Fixes another uncurried arity mismatch report

Author: bobzhang

jscomp/build_tests/super_errors/expected/arity_mismatch3.re.expected

@@ -4,5 +4,4 @@
 
   1 │ Belt.Array.mapU([||], (. a, b) => 1);
 
-  The field Js.Fn.I2 belongs to the record type Js.Fn.arity2
-  but a field was expected belonging to the record type Js.Fn.arity1
+  This function expected 1 argument, but got 2

jscomp/super_errors/super_typecore.ml

@@ -292,6 +292,20 @@ let report_error env ppf = function
         name (*kind*) Printtyp.path p;
        end;
       spellcheck ppf name valid_names;
+  | Name_type_mismatch (
+      "record",
+      Ldot (Ldot ((Lident "Js"), "Fn"), _arityFieldName),
+      (
+        _,
+        (Pdot (Pdot ((Pident {name = "Js"}), "Fn", _), arityA, _))
+      ),
+      [(
+        _,
+        (Pdot (Pdot ((Pident {name = "Js"}), "Fn", _), arityB, _))
+      )]
+    ) ->
+      (* modified *)
+      reportJsFnArityMismatch ~arityA ~arityB ppf
   | anythingElse ->
       Typecore.super_report_error_no_wrap_printing_env env ppf anythingElse
 

lib/4.06.1/unstable/js_compiler.ml

@@ -410011,6 +410011,20 @@ let report_error env ppf = function
         name (*kind*) Printtyp.path p;
        end;
       spellcheck ppf name valid_names;
+  | Name_type_mismatch (
+      "record",
+      Ldot (Ldot ((Lident "Js"), "Fn"), _arityFieldName),
+      (
+        _,
+        (Pdot (Pdot ((Pident {name = "Js"}), "Fn", _), arityA, _))
+      ),
+      [(
+        _,
+        (Pdot (Pdot ((Pident {name = "Js"}), "Fn", _), arityB, _))
+      )]
+    ) ->
+      (* modified *)
+      reportJsFnArityMismatch ~arityA ~arityB ppf
   | anythingElse ->
       Typecore.super_report_error_no_wrap_printing_env env ppf anythingElse
 

lib/4.06.1/whole_compiler.ml

@@ -435894,6 +435894,20 @@ let report_error env ppf = function
         name (*kind*) Printtyp.path p;
        end;
       spellcheck ppf name valid_names;
+  | Name_type_mismatch (
+      "record",
+      Ldot (Ldot ((Lident "Js"), "Fn"), _arityFieldName),
+      (
+        _,
+        (Pdot (Pdot ((Pident {name = "Js"}), "Fn", _), arityA, _))
+      ),
+      [(
+        _,
+        (Pdot (Pdot ((Pident {name = "Js"}), "Fn", _), arityB, _))
+      )]
+    ) ->
+      (* modified *)
+      reportJsFnArityMismatch ~arityA ~arityB ppf
   | anythingElse ->
       Typecore.super_report_error_no_wrap_printing_env env ppf anythingElse