Merge pull request #5468 from rescript-lang/convert-more-error-messages-from-ml-to-res

zth · web-flow · commit 6d81258cbf29 · 2022-06-25T21:32:05.000+02:00
convert more warnings in OCaml syntax to ReScript syntax
diff --git a/jscomp/build_tests/super_errors/expected/warnings4.res.expected b/jscomp/build_tests/super_errors/expected/warnings4.res.expected
@@ -10,4 +10,4 @@
   14 [2m│[0m 
 
   You forgot to handle a possible case here, for example: 
-  (#second(_)|#fourth|#third)
+  #second(_) | #fourth | #third
diff --git a/jscomp/build_tests/super_errors/expected/warnings5.res.expected b/jscomp/build_tests/super_errors/expected/warnings5.res.expected
@@ -0,0 +1,100 @@
+
+  [1;33mWarning number 9[0m
+  [36m/.../fixtures/warnings5.res[0m:[2m12:3-21[0m
+
+  10 [2m│[0m 
+  11 [2m│[0m switch y {
+  [1;33m12[0m [2m│[0m | [1;33m{otherValue: false}[0m => Js.log("first")
+  13 [2m│[0m }
+  14 [2m│[0m 
+
+  the following labels are not bound in this record pattern: someValue, typ
+Either bind these labels explicitly or add ', _' to the pattern.
+
+
+  [1;33mWarning number 8[0m
+  [36m/.../fixtures/warnings5.res[0m:[2m11:1-13:1[0m
+
+   9 [2m│[0m @val external y: someRecord = "otherVariable"
+  10 [2m│[0m 
+  [1;33m11[0m [2m│[0m [1;33mswitch y {[0m
+  [1;33m12[0m [2m│[0m [1;33m| {otherValue: false} => Js.log("first")[0m
+  [1;33m13[0m [2m│[0m [1;33m}[0m
+  14 [2m│[0m 
+  15 [2m│[0m switch y {
+
+  You forgot to handle a possible case here, for example: 
+  {otherValue: true}
+
+
+  [1;33mWarning number 9[0m
+  [36m/.../fixtures/warnings5.res[0m:[2m16:3-26[0m
+
+  14 [2m│[0m 
+  15 [2m│[0m switch y {
+  [1;33m16[0m [2m│[0m | [1;33m{typ: WithPayload(true)}[0m => Js.log("first")
+  17 [2m│[0m }
+  18 [2m│[0m 
+
+  the following labels are not bound in this record pattern: someValue, otherValue
+Either bind these labels explicitly or add ', _' to the pattern.
+
+
+  [1;33mWarning number 8[0m
+  [36m/.../fixtures/warnings5.res[0m:[2m15:1-17:1[0m
+
+  13 [2m│[0m }
+  14 [2m│[0m 
+  [1;33m15[0m [2m│[0m [1;33mswitch y {[0m
+  [1;33m16[0m [2m│[0m [1;33m| {typ: WithPayload(true)} => Js.log("first")[0m
+  [1;33m17[0m [2m│[0m [1;33m}[0m
+  18 [2m│[0m 
+  19 [2m│[0m let arr = [1]
+
+  You forgot to handle a possible case here, for example: 
+  {typ: WithPayload(false)} | 
+{typ: Variant | One | Two | Three | Four | Five | Six | Seven(_)}
+
+
+  [1;33mWarning number 8[0m
+  [36m/.../fixtures/warnings5.res[0m:[2m21:1-23:1[0m
+
+  19 [2m│[0m let arr = [1]
+  20 [2m│[0m 
+  [1;33m21[0m [2m│[0m [1;33mswitch arr {[0m
+  [1;33m22[0m [2m│[0m [1;33m| [] => Js.log("")[0m
+  [1;33m23[0m [2m│[0m [1;33m}[0m
+  24 [2m│[0m 
+  25 [2m│[0m switch arr {
+
+  You forgot to handle a possible case here, for example: 
+  [_]
+
+
+  [1;33mWarning number 8[0m
+  [36m/.../fixtures/warnings5.res[0m:[2m25:1-27:1[0m
+
+  23 [2m│[0m }
+  24 [2m│[0m 
+  [1;33m25[0m [2m│[0m [1;33mswitch arr {[0m
+  [1;33m26[0m [2m│[0m [1;33m| [one] => Js.log(one)[0m
+  [1;33m27[0m [2m│[0m [1;33m}[0m
+  28 [2m│[0m 
+  29 [2m│[0m switch arr {
+
+  You forgot to handle a possible case here, for example: 
+  []
+
+
+  [1;33mWarning number 8[0m
+  [36m/.../fixtures/warnings5.res[0m:[2m29:1-31:1[0m
+
+  27 [2m│[0m }
+  28 [2m│[0m 
+  [1;33m29[0m [2m│[0m [1;33mswitch arr {[0m
+  [1;33m30[0m [2m│[0m [1;33m| [1, 2] => ()[0m
+  [1;33m31[0m [2m│[0m [1;33m}[0m
+  32 [2m│[0m 
+
+  You forgot to handle a possible case here, for example: 
+  [1, 0] | [0, _] | []
diff --git a/jscomp/build_tests/super_errors/fixtures/warnings5.res b/jscomp/build_tests/super_errors/fixtures/warnings5.res
@@ -0,0 +1,31 @@
+type someTyp = Variant | WithPayload(bool) | One | Two | Three | Four | Five | Six | Seven(int)
+
+type someRecord = {
+  someValue: string,
+  otherValue: bool,
+  typ: someTyp,
+}
+
+@val external y: someRecord = "otherVariable"
+
+switch y {
+| {otherValue: false} => Js.log("first")
+}
+
+switch y {
+| {typ: WithPayload(true)} => Js.log("first")
+}
+
+let arr = [1]
+
+switch arr {
+| [] => Js.log("")
+}
+
+switch arr {
+| [one] => Js.log(one)
+}
+
+switch arr {
+| [1, 2] => ()
+}
diff --git a/jscomp/ext/warnings.ml b/jscomp/ext/warnings.ml
@@ -322,7 +322,7 @@ let message = function
       "You forgot to handle a possible case here, for example: \n  " ^ s
   | Non_closed_record_pattern s ->
       "the following labels are not bound in this record pattern: " ^ s
-      ^ "\nEither bind these labels explicitly or add '; _' to the pattern."
+      ^ "\nEither bind these labels explicitly or add ', _' to the pattern."
   | Statement_type ->
       "This expression returns a value, but you're not doing anything with it. \
        If this is on purpose, wrap it with `ignore`."
diff --git a/jscomp/ml/parmatch.ml b/jscomp/ml/parmatch.ml
@@ -406,7 +406,7 @@ let rec pretty_val ppf v =
   | Tpat_construct (_, cstr, []) ->
       fprintf ppf "%s" cstr.cstr_name
   | Tpat_construct (_, cstr, [w]) ->
-      fprintf ppf "@[<2>%s@ %a@]" cstr.cstr_name pretty_arg w
+      fprintf ppf "@[<2>%s(%a)@]" cstr.cstr_name pretty_arg w
   | Tpat_construct (_, cstr, vs) ->
       let name = cstr.cstr_name in
       begin match (name, vs) with
@@ -426,23 +426,19 @@ let rec pretty_val ppf v =
             | _ -> true) in
       begin match filtered_lvs with
       | [] -> fprintf ppf "_"
-      | (_, lbl, _) :: q ->
-          let elision_mark ppf =
-            (* we assume that there is no label repetitions here *)
-             if Array.length lbl.lbl_all > 1 + List.length q then
-               fprintf ppf ";@ _@ "
-             else () in
+      | (_, _lbl, _) :: _q ->
+          let elision_mark _ = () in
           fprintf ppf "@[{%a%t}@]"
             pretty_lvals filtered_lvs elision_mark
       end
   | Tpat_array vs ->
-      fprintf ppf "@[[| %a |]@]" (pretty_vals " ;") vs
+      fprintf ppf "@[[%a]@]" (pretty_vals ",") vs
   | Tpat_lazy v ->
       fprintf ppf "@[<2>lazy@ %a@]" pretty_arg v
   | Tpat_alias (v, x,_) ->
       fprintf ppf "@[(%a@ as %a)@]" pretty_val v Ident.print x
   | Tpat_or (v,w,_)    ->
-      fprintf ppf "@[(%a|@,%a)@]" pretty_or v pretty_or w
+      fprintf ppf "@[%a | @,%a@]" pretty_or v pretty_or w
 
 and pretty_car ppf v = match v.pat_desc with
 | Tpat_construct (_,cstr, [_ ; _])
@@ -463,7 +459,7 @@ and pretty_arg ppf v = match v.pat_desc with
 
 and pretty_or ppf v = match v.pat_desc with
 | Tpat_or (v,w,_) ->
-    fprintf ppf "%a|@,%a" pretty_or v pretty_or w
+    fprintf ppf "%a | @,%a" pretty_or v pretty_or w
 | _ -> pretty_val ppf v
 
 and pretty_vals sep ppf = function
@@ -475,9 +471,9 @@ and pretty_vals sep ppf = function
 and pretty_lvals ppf = function
   | [] -> ()
   | [_,lbl,v] ->
-      fprintf ppf "%s=%a" lbl.lbl_name pretty_val v
+      fprintf ppf "%s: %a" lbl.lbl_name pretty_val v
   | (_, lbl,v)::rest ->
-      fprintf ppf "%s=%a;@ %a"
+      fprintf ppf "%s: %a,@ %a"
         lbl.lbl_name pretty_val v pretty_lvals rest
 
 let top_pretty ppf v =
diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml
@@ -9870,7 +9870,7 @@ let message = function
       "You forgot to handle a possible case here, for example: \n  " ^ s
   | Non_closed_record_pattern s ->
       "the following labels are not bound in this record pattern: " ^ s
-      ^ "\nEither bind these labels explicitly or add '; _' to the pattern."
+      ^ "\nEither bind these labels explicitly or add ', _' to the pattern."
   | Statement_type ->
       "This expression returns a value, but you're not doing anything with it. \
        If this is on purpose, wrap it with `ignore`."
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -2275,7 +2275,7 @@ let message = function
       "You forgot to handle a possible case here, for example: \n  " ^ s
   | Non_closed_record_pattern s ->
       "the following labels are not bound in this record pattern: " ^ s
-      ^ "\nEither bind these labels explicitly or add '; _' to the pattern."
+      ^ "\nEither bind these labels explicitly or add ', _' to the pattern."
   | Statement_type ->
       "This expression returns a value, but you're not doing anything with it. \
        If this is on purpose, wrap it with `ignore`."
@@ -26812,7 +26812,7 @@ let rec pretty_val ppf v =
   | Tpat_construct (_, cstr, []) ->
       fprintf ppf "%s" cstr.cstr_name
   | Tpat_construct (_, cstr, [w]) ->
-      fprintf ppf "@[<2>%s@ %a@]" cstr.cstr_name pretty_arg w
+      fprintf ppf "@[<2>%s(%a)@]" cstr.cstr_name pretty_arg w
   | Tpat_construct (_, cstr, vs) ->
       let name = cstr.cstr_name in
       begin match (name, vs) with
@@ -26832,23 +26832,19 @@ let rec pretty_val ppf v =
             | _ -> true) in
       begin match filtered_lvs with
       | [] -> fprintf ppf "_"
-      | (_, lbl, _) :: q ->
-          let elision_mark ppf =
-            (* we assume that there is no label repetitions here *)
-             if Array.length lbl.lbl_all > 1 + List.length q then
-               fprintf ppf ";@ _@ "
-             else () in
+      | (_, _lbl, _) :: _q ->
+          let elision_mark _ = () in
           fprintf ppf "@[{%a%t}@]"
             pretty_lvals filtered_lvs elision_mark
       end
   | Tpat_array vs ->
-      fprintf ppf "@[[| %a |]@]" (pretty_vals " ;") vs
+      fprintf ppf "@[[%a]@]" (pretty_vals ",") vs
   | Tpat_lazy v ->
       fprintf ppf "@[<2>lazy@ %a@]" pretty_arg v
   | Tpat_alias (v, x,_) ->
       fprintf ppf "@[(%a@ as %a)@]" pretty_val v Ident.print x
   | Tpat_or (v,w,_)    ->
-      fprintf ppf "@[(%a|@,%a)@]" pretty_or v pretty_or w
+      fprintf ppf "@[%a | @,%a@]" pretty_or v pretty_or w
 
 and pretty_car ppf v = match v.pat_desc with
 | Tpat_construct (_,cstr, [_ ; _])
@@ -26869,7 +26865,7 @@ and pretty_arg ppf v = match v.pat_desc with
 
 and pretty_or ppf v = match v.pat_desc with
 | Tpat_or (v,w,_) ->
-    fprintf ppf "%a|@,%a" pretty_or v pretty_or w
+    fprintf ppf "%a | @,%a" pretty_or v pretty_or w
 | _ -> pretty_val ppf v
 
 and pretty_vals sep ppf = function
@@ -26881,9 +26877,9 @@ and pretty_vals sep ppf = function
 and pretty_lvals ppf = function
   | [] -> ()
   | [_,lbl,v] ->
-      fprintf ppf "%s=%a" lbl.lbl_name pretty_val v
+      fprintf ppf "%s: %a" lbl.lbl_name pretty_val v
   | (_, lbl,v)::rest ->
-      fprintf ppf "%s=%a;@ %a"
+      fprintf ppf "%s: %a,@ %a"
         lbl.lbl_name pretty_val v pretty_lvals rest
 
 let top_pretty ppf v =
diff --git a/lib/4.06.1/unstable/js_playground_compiler.ml b/lib/4.06.1/unstable/js_playground_compiler.ml
@@ -2022,7 +2022,7 @@ let message = function
       "You forgot to handle a possible case here, for example: \n  " ^ s
   | Non_closed_record_pattern s ->
       "the following labels are not bound in this record pattern: " ^ s
-      ^ "\nEither bind these labels explicitly or add '; _' to the pattern."
+      ^ "\nEither bind these labels explicitly or add ', _' to the pattern."
   | Statement_type ->
       "This expression returns a value, but you're not doing anything with it. \
        If this is on purpose, wrap it with `ignore`."
@@ -26812,7 +26812,7 @@ let rec pretty_val ppf v =
   | Tpat_construct (_, cstr, []) ->
       fprintf ppf "%s" cstr.cstr_name
   | Tpat_construct (_, cstr, [w]) ->
-      fprintf ppf "@[<2>%s@ %a@]" cstr.cstr_name pretty_arg w
+      fprintf ppf "@[<2>%s(%a)@]" cstr.cstr_name pretty_arg w
   | Tpat_construct (_, cstr, vs) ->
       let name = cstr.cstr_name in
       begin match (name, vs) with
@@ -26832,23 +26832,19 @@ let rec pretty_val ppf v =
             | _ -> true) in
       begin match filtered_lvs with
       | [] -> fprintf ppf "_"
-      | (_, lbl, _) :: q ->
-          let elision_mark ppf =
-            (* we assume that there is no label repetitions here *)
-             if Array.length lbl.lbl_all > 1 + List.length q then
-               fprintf ppf ";@ _@ "
-             else () in
+      | (_, _lbl, _) :: _q ->
+          let elision_mark _ = () in
           fprintf ppf "@[{%a%t}@]"
             pretty_lvals filtered_lvs elision_mark
       end
   | Tpat_array vs ->
-      fprintf ppf "@[[| %a |]@]" (pretty_vals " ;") vs
+      fprintf ppf "@[[%a]@]" (pretty_vals ",") vs
   | Tpat_lazy v ->
       fprintf ppf "@[<2>lazy@ %a@]" pretty_arg v
   | Tpat_alias (v, x,_) ->
       fprintf ppf "@[(%a@ as %a)@]" pretty_val v Ident.print x
   | Tpat_or (v,w,_)    ->
-      fprintf ppf "@[(%a|@,%a)@]" pretty_or v pretty_or w
+      fprintf ppf "@[%a | @,%a@]" pretty_or v pretty_or w
 
 and pretty_car ppf v = match v.pat_desc with
 | Tpat_construct (_,cstr, [_ ; _])
@@ -26869,7 +26865,7 @@ and pretty_arg ppf v = match v.pat_desc with
 
 and pretty_or ppf v = match v.pat_desc with
 | Tpat_or (v,w,_) ->
-    fprintf ppf "%a|@,%a" pretty_or v pretty_or w
+    fprintf ppf "%a | @,%a" pretty_or v pretty_or w
 | _ -> pretty_val ppf v
 
 and pretty_vals sep ppf = function
@@ -26881,9 +26877,9 @@ and pretty_vals sep ppf = function
 and pretty_lvals ppf = function
   | [] -> ()
   | [_,lbl,v] ->
-      fprintf ppf "%s=%a" lbl.lbl_name pretty_val v
+      fprintf ppf "%s: %a" lbl.lbl_name pretty_val v
   | (_, lbl,v)::rest ->
-      fprintf ppf "%s=%a;@ %a"
+      fprintf ppf "%s: %a,@ %a"
         lbl.lbl_name pretty_val v pretty_lvals rest
 
 let top_pretty ppf v =
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,100 @@ @@
++
 +  [1;33mWarning number 9[0m
 +  [36m/.../fixtures/warnings5.res[0m:[2m12:3-21[0m
++
 +  10 [2m│[0m
 +  11 [2m│[0m switch y {
 +  [1;33m12[0m [2m│[0m | [1;33m{otherValue: false}[0m => Js.log("first")
 +  13 [2m│[0m }
 +  14 [2m│[0m
++
 +  the following labels are not bound in this record pattern: someValue, typ
 +Either bind these labels explicitly or add ', _' to the pattern.
++
++
 +  [1;33mWarning number 8[0m
 +  [36m/.../fixtures/warnings5.res[0m:[2m11:1-13:1[0m
++
 +   9 [2m│[0m @val external y: someRecord = "otherVariable"
 +  10 [2m│[0m
 +  [1;33m11[0m [2m│[0m [1;33mswitch y {[0m
 +  [1;33m12[0m [2m│[0m [1;33m| {otherValue: false} => Js.log("first")[0m
 +  [1;33m13[0m [2m│[0m [1;33m}[0m
 +  14 [2m│[0m
 +  15 [2m│[0m switch y {
++
 +  You forgot to handle a possible case here, for example:
 +  {otherValue: true}
++
++
 +  [1;33mWarning number 9[0m
 +  [36m/.../fixtures/warnings5.res[0m:[2m16:3-26[0m
++
 +  14 [2m│[0m
 +  15 [2m│[0m switch y {
 +  [1;33m16[0m [2m│[0m | [1;33m{typ: WithPayload(true)}[0m => Js.log("first")
 +  17 [2m│[0m }
 +  18 [2m│[0m
++
 +  the following labels are not bound in this record pattern: someValue, otherValue
 +Either bind these labels explicitly or add ', _' to the pattern.
++
++
 +  [1;33mWarning number 8[0m
 +  [36m/.../fixtures/warnings5.res[0m:[2m15:1-17:1[0m
++
 +  13 [2m│[0m }
 +  14 [2m│[0m
 +  [1;33m15[0m [2m│[0m [1;33mswitch y {[0m
 +  [1;33m16[0m [2m│[0m [1;33m| {typ: WithPayload(true)} => Js.log("first")[0m
 +  [1;33m17[0m [2m│[0m [1;33m}[0m
 +  18 [2m│[0m
 +  19 [2m│[0m let arr = [1]
++
 +  You forgot to handle a possible case here, for example:
 +  {typ: WithPayload(false)} |
 +{typ: Variant | One | Two | Three | Four | Five | Six | Seven(_)}
++
++
 +  [1;33mWarning number 8[0m
 +  [36m/.../fixtures/warnings5.res[0m:[2m21:1-23:1[0m
++
 +  19 [2m│[0m let arr = [1]
 +  20 [2m│[0m
 +  [1;33m21[0m [2m│[0m [1;33mswitch arr {[0m
 +  [1;33m22[0m [2m│[0m [1;33m| [] => Js.log("")[0m
 +  [1;33m23[0m [2m│[0m [1;33m}[0m
 +  24 [2m│[0m
 +  25 [2m│[0m switch arr {
++
 +  You forgot to handle a possible case here, for example:
 +  [_]
++
++
 +  [1;33mWarning number 8[0m
 +  [36m/.../fixtures/warnings5.res[0m:[2m25:1-27:1[0m
++
 +  23 [2m│[0m }
 +  24 [2m│[0m
 +  [1;33m25[0m [2m│[0m [1;33mswitch arr {[0m
 +  [1;33m26[0m [2m│[0m [1;33m| [one] => Js.log(one)[0m
 +  [1;33m27[0m [2m│[0m [1;33m}[0m
 +  28 [2m│[0m
 +  29 [2m│[0m switch arr {
++
 +  You forgot to handle a possible case here, for example:
 +  []
++
++
 +  [1;33mWarning number 8[0m
 +  [36m/.../fixtures/warnings5.res[0m:[2m29:1-31:1[0m
++
 +  27 [2m│[0m }
 +  28 [2m│[0m
 +  [1;33m29[0m [2m│[0m [1;33mswitch arr {[0m
 +  [1;33m30[0m [2m│[0m [1;33m| [1, 2] => ()[0m
 +  [1;33m31[0m [2m│[0m [1;33m}[0m
 +  32 [2m│[0m
++
 +  You forgot to handle a possible case here, for example:
 +  [1, 0] | [0, _] | []