sync up super_errors, partial fix of #4315 - cherry-pick

bobzhang · bobzhang · commit 1a157d027281 · 2020-05-08T13:16:27.000+08:00
TODO: add more fixtures

snapshot
diff --git a/jscomp/build_tests/super_errors/expected/arity_mismatch.re.expected b/jscomp/build_tests/super_errors/expected/arity_mismatch.re.expected
@@ -0,0 +1,9 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/arity_mismatch.re[0m [2m3:21-27[0m
+  
+  1 [2m│[0m 
+  2 [2m│[0m let makeVar = (. ~f, ()) => 34;
+  [1;31m3[0m [2m│[0m let makeVariables = [1;31mmakeVar[0m(. ~f=f => f);
+  
+  This function has arity2 but was expected arity1
diff --git a/jscomp/build_tests/super_errors/expected/arity_mismatch2.re.expected b/jscomp/build_tests/super_errors/expected/arity_mismatch2.re.expected
@@ -0,0 +1,9 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/arity_mismatch2.re[0m [2m3:21-27[0m
+  
+  1 [2m│[0m 
+  2 [2m│[0m let makeVar = (. f, ()) => 34;
+  [1;31m3[0m [2m│[0m let makeVariables = [1;31mmakeVar[0m(. 1,2,3);
+  
+  This function has arity2 but was expected arity3
diff --git a/jscomp/build_tests/super_errors/expected/curry_in_uncurry.re.expected b/jscomp/build_tests/super_errors/expected/curry_in_uncurry.re.expected
@@ -0,0 +1,9 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/curry_in_uncurry.re[0m [2m3:1[0m
+  
+  1 [2m│[0m let f = (a,b) => a + b;
+  2 [2m│[0m 
+  [1;31m3[0m [2m│[0m [1;31mf[0m(.2,2)->Js.log;
+  
+  This function is a curried function where an uncurried function is expected
diff --git a/jscomp/build_tests/super_errors/expected/method_arity_mismatch.re.expected b/jscomp/build_tests/super_errors/expected/method_arity_mismatch.re.expected
@@ -0,0 +1,10 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/method_arity_mismatch.re[0m [2m3:8-9[0m
+  
+  1 [2m│[0m let f = ( obj ) => {
+  2 [2m│[0m     obj##hi (1,2);
+  [1;31m3[0m [2m│[0m     obj[1;31m##[0mhi (1)
+  4 [2m│[0m }
+  
+  This method has arity2 but was expected arity1
diff --git a/jscomp/build_tests/super_errors/expected/uncurry_in_curry.re.expected b/jscomp/build_tests/super_errors/expected/uncurry_in_curry.re.expected
@@ -0,0 +1,15 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/uncurry_in_curry.re[0m [2m3:1[0m
+  
+  1 [2m│[0m let f = (.a,b) => a + b;
+  2 [2m│[0m 
+  [1;31m3[0m [2m│[0m [1;31mf[0m(2,2);
+  
+  This is an uncurried BuckleScript function. [1;33mIt must be applied with a dot[0m.
+  
+  Like this: [1;33mfoo(. a, b)[0m
+  Not like this: [2mfoo(a, b)[0m
+  
+  This guarantees that your function is fully applied. More info here:
+  https://bucklescript.github.io/docs/en/function.html#solution-guaranteed-uncurrying
diff --git a/jscomp/build_tests/super_errors/fixtures/arity_mismatch.re b/jscomp/build_tests/super_errors/fixtures/arity_mismatch.re
@@ -0,0 +1,3 @@
+
+let makeVar = (. ~f, ()) => 34;
+let makeVariables = makeVar(. ~f=f => f);
diff --git a/jscomp/build_tests/super_errors/fixtures/arity_mismatch2.re b/jscomp/build_tests/super_errors/fixtures/arity_mismatch2.re
@@ -0,0 +1,3 @@
+
+let makeVar = (. f, ()) => 34;
+let makeVariables = makeVar(. 1,2,3);
diff --git a/jscomp/build_tests/super_errors/fixtures/curry_in_uncurry.re b/jscomp/build_tests/super_errors/fixtures/curry_in_uncurry.re
@@ -0,0 +1,3 @@
+let f = (a,b) => a + b;
+
+f(.2,2)->Js.log;
diff --git a/jscomp/build_tests/super_errors/fixtures/method_arity_mismatch.re b/jscomp/build_tests/super_errors/fixtures/method_arity_mismatch.re
@@ -0,0 +1,4 @@
+let f = ( obj ) => {
+    obj##hi (1,2);
+    obj##hi (1)
+}
diff --git a/jscomp/build_tests/super_errors/fixtures/uncurry_in_curry.re b/jscomp/build_tests/super_errors/fixtures/uncurry_in_curry.re
@@ -0,0 +1,3 @@
+let f = (.a,b) => a + b;
+
+f(2,2);
diff --git a/jscomp/super_errors/super_typecore.ml b/jscomp/super_errors/super_typecore.ml
@@ -177,6 +177,22 @@ let report_error env ppf = function
           fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
         (function ppf ->
           fprintf ppf "but on the right-hand side it has type")
+  | Expr_type_clash ( 
+      (_, {desc = Tarrow _}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)}) :: _
+    ) -> 
+    fprintf ppf "This function is a curried function where an uncurried function is expected"    
+  | Expr_type_clash (
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This function has %s but was expected %s" a b 
+  | Expr_type_clash ( 
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This method has %s but was expected %s" a b 
+
   | Expr_type_clash trace ->
       (* modified *)
       fprintf ppf "@[<v>";
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -412412,6 +412412,22 @@ let report_error env ppf = function
           fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
         (function ppf ->
           fprintf ppf "but on the right-hand side it has type")
+  | Expr_type_clash ( 
+      (_, {desc = Tarrow _}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)}) :: _
+    ) -> 
+    fprintf ppf "This function is a curried function where an uncurried function is expected"    
+  | Expr_type_clash (
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This function has %s but was expected %s" a b 
+  | Expr_type_clash ( 
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This method has %s but was expected %s" a b 
+
   | Expr_type_clash trace ->
       (* modified *)
       fprintf ppf "@[<v>";
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
@@ -572505,6 +572505,22 @@ let report_error env ppf = function
           fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
         (function ppf ->
           fprintf ppf "but on the right-hand side it has type")
+  | Expr_type_clash ( 
+      (_, {desc = Tarrow _}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)}) :: _
+    ) -> 
+    fprintf ppf "This function is a curried function where an uncurried function is expected"    
+  | Expr_type_clash (
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This function has %s but was expected %s" a b 
+  | Expr_type_clash ( 
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This method has %s but was expected %s" a b 
+
   | Expr_type_clash trace ->
       (* modified *)
       fprintf ppf "@[<v>";
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -419768,6 +419768,22 @@ let report_error env ppf = function
           fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
         (function ppf ->
           fprintf ppf "but on the right-hand side it has type")
+  | Expr_type_clash ( 
+      (_, {desc = Tarrow _}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)}) :: _
+    ) -> 
+    fprintf ppf "This function is a curried function where an uncurried function is expected"    
+  | Expr_type_clash (
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This function has %s but was expected %s" a b 
+  | Expr_type_clash ( 
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
+      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
+    ) when a <> b -> 
+    fprintf ppf "This method has %s but was expected %s" a b 
+
   | Expr_type_clash trace ->
       (* modified *)
       fprintf ppf "@[<v>";

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
++
 +  [1;31mWe've found a bug for you![0m
 +  [36m/.../fixtures/arity_mismatch.re[0m [2m3:21-27[0m
++
 +  1 [2m│[0m
 +  2 [2m│[0m let makeVar = (. ~f, ()) => 34;
 +  [1;31m3[0m [2m│[0m let makeVariables = [1;31mmakeVar[0m(. ~f=f => f);
++
 +  This function has arity2 but was expected arity1
-Original file line number
+Diff line change
@@ @@ -0,0 +1,10 @@ @@
++
 +  [1;31mWe've found a bug for you![0m
 +  [36m/.../fixtures/method_arity_mismatch.re[0m [2m3:8-9[0m
++
 +  1 [2m│[0m let f = ( obj ) => {
 +  2 [2m│[0m     obj##hi (1,2);
 +  [1;31m3[0m [2m│[0m     obj[1;31m##[0mhi (1)
 +  4 [2m│[0m }
++
 +  This method has arity2 but was expected arity1
-Original file line number
+Diff line change
@@ @@ -0,0 +1,15 @@ @@
++
 +  [1;31mWe've found a bug for you![0m
 +  [36m/.../fixtures/uncurry_in_curry.re[0m [2m3:1[0m
++
 +  1 [2m│[0m let f = (.a,b) => a + b;
 +  2 [2m│[0m
 +  [1;31m3[0m [2m│[0m [1;31mf[0m(2,2);
++
 +  This is an uncurried BuckleScript function. [1;33mIt must be applied with a dot[0m.
++
 +  Like this: [1;33mfoo(. a, b)[0m
 +  Not like this: [2mfoo(a, b)[0m
++
 +  This guarantees that your function is fully applied. More info here:
 +  https://bucklescript.github.io/docs/en/function.html#solution-guaranteed-uncurrying
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+`
	`2`	`+let makeVar = (. ~f, ()) => 34;`
	`3`	`+let makeVariables = makeVar(. ~f=f => f);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+`
	`2`	`+let makeVar = (. f, ()) => 34;`
	`3`	`+let makeVariables = makeVar(. 1,2,3);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+let f = (a,b) => a + b;`
	`2`	`+`
	`3`	`+f(.2,2)->Js.log;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+let f = (.a,b) => a + b;`
	`2`	`+`
	`3`	`+f(2,2);`