Merge pull request #4733 from rescript-lang/no_77

bring back configured as error for super errors

Author: bobzhang

jscomp/build_tests/super_errors/expected/highlighting4.re.expected

@@ -1,5 +1,5 @@
 
-  Warning number 3
+  Warning number 3 (configured as error) 
   /.../fixtures/highlighting4.re:5:10
 
   3 │ [@deprecated]

jscomp/build_tests/super_errors/fixtures/highlighting4.re

@@ -1,4 +1,4 @@
-
+[@warnerror "A"];
 /* single char highlighted */
 [@deprecated]
 type a = int;

jscomp/super_errors/super_location.ml

@@ -25,8 +25,12 @@ let print_loc ~normalizedRange ppf (loc : Location.t) =
   fprintf ppf "@{<filename>%a@}%a" print_filename loc.loc_start.pos_fname dim_loc normalizedRange
 ;;
 
-let print intro ppf (loc : Location.t) =
-    fprintf ppf "@[@{<error>%s@}@]@," intro;
+let print ~message_kind intro ppf (loc : Location.t) =
+    begin match message_kind with
+    | `warning -> fprintf ppf "@[@{<info>%s@}@]@," intro
+    | `warning_as_error -> fprintf ppf "@[@{<error>%s@} (configured as error) @]@," intro
+    | `error -> fprintf ppf "@[@{<error>%s@}@]@," intro
+    end;
     (* ocaml's reported line/col numbering is horrible and super error-prone
       when being handled programmatically (or humanly for that matter. If you're
       an ocaml contributor reading this: who the heck reads the character count
@@ -60,7 +64,7 @@ let print intro ppf (loc : Location.t) =
            branch might not be reached (aka no inline file content display) so
            we don't wanna end up with two line breaks in the the consequent *)
         fprintf ppf "@,%a"
-          (Super_misc.print_file  ~lines ~range)
+          (Super_misc.print_file ~is_warning:(message_kind=`warning) ~lines ~range)
           ()
       with
       (* this might happen if the file is e.g. "", "_none_" or any of the fake file name placeholders.
@@ -74,7 +78,7 @@ let print intro ppf (loc : Location.t) =
 let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
   setup_colors ();
   (* open a vertical box. Everything in our message is indented 2 spaces *)
-  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print  "We've found a bug for you!") loc msg;
+  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print ~message_kind:`error "We've found a bug for you!") loc msg;
   List.iter (Format.fprintf ppf "@,@[%a@]" super_error_reporter) sub
     (* no need to flush here; location's report_exception (which uses this ultimately) flushes *)
 
@@ -84,10 +88,11 @@ let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
 let super_warning_printer loc ppf w =
   match Warnings.report w with
   | `Inactive -> ()
-  | `Active { Warnings. number = _; message = _;  sub_locs = _} ->
+  | `Active { Warnings. number = _; message = _; is_error; sub_locs = _} ->
     setup_colors ();
-    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
-      (print  ("Warning number " ^ (Warnings.number w |> string_of_int)))
+    let message_kind = if is_error then `warning_as_error else `warning in
+    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
+      (print ~message_kind ("Warning number " ^ (Warnings.number w |> string_of_int)))
       loc
       (Warnings.message w);
     (* at this point, you can display sub_locs too, from e.g. https://github.com/ocaml/ocaml/commit/f6d53cc38f87c67fbf49109f5fb79a0334bab17a

jscomp/super_errors/super_misc.ml

@@ -36,7 +36,7 @@ type current_printed_line_status =
 (* Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
 let print_file 
-
+~is_warning 
 (* start_line_start_char inclusive, end_line_end_char exclusive *)
 ~range:((start_line, start_line_start_char), (end_line, end_line_end_char)) 
 ~lines
@@ -69,10 +69,10 @@ ppf
   | Some n -> n
   in
   (* coloring *)
-  let highlighted_line_number : _ format = "@{<error>%s@}%a" in
+  let highlighted_line_number : _ format = if is_warning then "@{<info>%s@}%a" else "@{<error>%s@}%a" in
 
   let print_char_maybe_highlight ~begin_highlight_line ~end_highlight_line ch =
-    let highlighted_open_tag: _ format = "@{<error>" in
+    let highlighted_open_tag: _ format = if is_warning then "@{<info>" else "@{<error>" in
     if begin_highlight_line then fprintf ppf highlighted_open_tag;
     fprintf ppf "%c@," ch;
     if end_highlight_line then fprintf ppf "@}"

jscomp/super_errors/super_misc.mli

@@ -1,5 +1,3 @@
 (** Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
-val print_file: 
-  range:(int * int) * (int * int) ->
-  lines:string array -> Format.formatter -> unit -> unit
+val print_file: is_warning:bool -> range:(int * int) * (int * int) -> lines:string array -> Format.formatter -> unit -> unit

lib/4.06.1/unstable/js_compiler.ml

@@ -409500,9 +409500,7 @@ module Super_misc : sig
 #1 "super_misc.mli"
 (** Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
-val print_file: 
-  range:(int * int) * (int * int) ->
-  lines:string array -> Format.formatter -> unit -> unit
+val print_file: is_warning:bool -> range:(int * int) * (int * int) -> lines:string array -> Format.formatter -> unit -> unit
 
 end = struct
 #1 "super_misc.ml"
@@ -409544,7 +409542,7 @@ type current_printed_line_status =
 (* Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
 let print_file 
-
+~is_warning 
 (* start_line_start_char inclusive, end_line_end_char exclusive *)
 ~range:((start_line, start_line_start_char), (end_line, end_line_end_char)) 
 ~lines
@@ -409577,10 +409575,10 @@ ppf
   | Some n -> n
   in
   (* coloring *)
-  let highlighted_line_number : _ format = "@{<error>%s@}%a" in
+  let highlighted_line_number : _ format = if is_warning then "@{<info>%s@}%a" else "@{<error>%s@}%a" in
 
   let print_char_maybe_highlight ~begin_highlight_line ~end_highlight_line ch =
-    let highlighted_open_tag: _ format = "@{<error>" in
+    let highlighted_open_tag: _ format = if is_warning then "@{<info>" else "@{<error>" in
     if begin_highlight_line then fprintf ppf highlighted_open_tag;
     fprintf ppf "%c@," ch;
     if end_highlight_line then fprintf ppf "@}"
@@ -409721,8 +409719,12 @@ let print_loc ~normalizedRange ppf (loc : Location.t) =
   fprintf ppf "@{<filename>%a@}%a" print_filename loc.loc_start.pos_fname dim_loc normalizedRange
 ;;
 
-let print intro ppf (loc : Location.t) =
-    fprintf ppf "@[@{<error>%s@}@]@," intro;
+let print ~message_kind intro ppf (loc : Location.t) =
+    begin match message_kind with
+    | `warning -> fprintf ppf "@[@{<info>%s@}@]@," intro
+    | `warning_as_error -> fprintf ppf "@[@{<error>%s@} (configured as error) @]@," intro
+    | `error -> fprintf ppf "@[@{<error>%s@}@]@," intro
+    end;
     (* ocaml's reported line/col numbering is horrible and super error-prone
       when being handled programmatically (or humanly for that matter. If you're
       an ocaml contributor reading this: who the heck reads the character count
@@ -409756,7 +409758,7 @@ let print intro ppf (loc : Location.t) =
            branch might not be reached (aka no inline file content display) so
            we don't wanna end up with two line breaks in the the consequent *)
         fprintf ppf "@,%a"
-          (Super_misc.print_file  ~lines ~range)
+          (Super_misc.print_file ~is_warning:(message_kind=`warning) ~lines ~range)
           ()
       with
       (* this might happen if the file is e.g. "", "_none_" or any of the fake file name placeholders.
@@ -409770,7 +409772,7 @@ let print intro ppf (loc : Location.t) =
 let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
   setup_colors ();
   (* open a vertical box. Everything in our message is indented 2 spaces *)
-  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print  "We've found a bug for you!") loc msg;
+  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print ~message_kind:`error "We've found a bug for you!") loc msg;
   List.iter (Format.fprintf ppf "@,@[%a@]" super_error_reporter) sub
     (* no need to flush here; location's report_exception (which uses this ultimately) flushes *)
 
@@ -409780,10 +409782,11 @@ let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
 let super_warning_printer loc ppf w =
   match Warnings.report w with
   | `Inactive -> ()
-  | `Active { Warnings. number = _; message = _;  sub_locs = _} ->
+  | `Active { Warnings. number = _; message = _; is_error; sub_locs = _} ->
     setup_colors ();
-    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
-      (print  ("Warning number " ^ (Warnings.number w |> string_of_int)))
+    let message_kind = if is_error then `warning_as_error else `warning in
+    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
+      (print ~message_kind ("Warning number " ^ (Warnings.number w |> string_of_int)))
       loc
       (Warnings.message w);
     (* at this point, you can display sub_locs too, from e.g. https://github.com/ocaml/ocaml/commit/f6d53cc38f87c67fbf49109f5fb79a0334bab17a

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -569596,9 +569596,7 @@ module Super_misc : sig
 #1 "super_misc.mli"
 (** Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
-val print_file: 
-  range:(int * int) * (int * int) ->
-  lines:string array -> Format.formatter -> unit -> unit
+val print_file: is_warning:bool -> range:(int * int) * (int * int) -> lines:string array -> Format.formatter -> unit -> unit
 
 end = struct
 #1 "super_misc.ml"
@@ -569640,7 +569638,7 @@ type current_printed_line_status =
 (* Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
 let print_file 
-
+~is_warning 
 (* start_line_start_char inclusive, end_line_end_char exclusive *)
 ~range:((start_line, start_line_start_char), (end_line, end_line_end_char)) 
 ~lines
@@ -569673,10 +569671,10 @@ ppf
   | Some n -> n
   in
   (* coloring *)
-  let highlighted_line_number : _ format = "@{<error>%s@}%a" in
+  let highlighted_line_number : _ format = if is_warning then "@{<info>%s@}%a" else "@{<error>%s@}%a" in
 
   let print_char_maybe_highlight ~begin_highlight_line ~end_highlight_line ch =
-    let highlighted_open_tag: _ format = "@{<error>" in
+    let highlighted_open_tag: _ format = if is_warning then "@{<info>" else "@{<error>" in
     if begin_highlight_line then fprintf ppf highlighted_open_tag;
     fprintf ppf "%c@," ch;
     if end_highlight_line then fprintf ppf "@}"
@@ -569817,8 +569815,12 @@ let print_loc ~normalizedRange ppf (loc : Location.t) =
   fprintf ppf "@{<filename>%a@}%a" print_filename loc.loc_start.pos_fname dim_loc normalizedRange
 ;;
 
-let print intro ppf (loc : Location.t) =
-    fprintf ppf "@[@{<error>%s@}@]@," intro;
+let print ~message_kind intro ppf (loc : Location.t) =
+    begin match message_kind with
+    | `warning -> fprintf ppf "@[@{<info>%s@}@]@," intro
+    | `warning_as_error -> fprintf ppf "@[@{<error>%s@} (configured as error) @]@," intro
+    | `error -> fprintf ppf "@[@{<error>%s@}@]@," intro
+    end;
     (* ocaml's reported line/col numbering is horrible and super error-prone
       when being handled programmatically (or humanly for that matter. If you're
       an ocaml contributor reading this: who the heck reads the character count
@@ -569852,7 +569854,7 @@ let print intro ppf (loc : Location.t) =
            branch might not be reached (aka no inline file content display) so
            we don't wanna end up with two line breaks in the the consequent *)
         fprintf ppf "@,%a"
-          (Super_misc.print_file  ~lines ~range)
+          (Super_misc.print_file ~is_warning:(message_kind=`warning) ~lines ~range)
           ()
       with
       (* this might happen if the file is e.g. "", "_none_" or any of the fake file name placeholders.
@@ -569866,7 +569868,7 @@ let print intro ppf (loc : Location.t) =
 let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
   setup_colors ();
   (* open a vertical box. Everything in our message is indented 2 spaces *)
-  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print  "We've found a bug for you!") loc msg;
+  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print ~message_kind:`error "We've found a bug for you!") loc msg;
   List.iter (Format.fprintf ppf "@,@[%a@]" super_error_reporter) sub
     (* no need to flush here; location's report_exception (which uses this ultimately) flushes *)
 
@@ -569876,10 +569878,11 @@ let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
 let super_warning_printer loc ppf w =
   match Warnings.report w with
   | `Inactive -> ()
-  | `Active { Warnings. number = _; message = _;  sub_locs = _} ->
+  | `Active { Warnings. number = _; message = _; is_error; sub_locs = _} ->
     setup_colors ();
-    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
-      (print  ("Warning number " ^ (Warnings.number w |> string_of_int)))
+    let message_kind = if is_error then `warning_as_error else `warning in
+    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
+      (print ~message_kind ("Warning number " ^ (Warnings.number w |> string_of_int)))
       loc
       (Warnings.message w);
     (* at this point, you can display sub_locs too, from e.g. https://github.com/ocaml/ocaml/commit/f6d53cc38f87c67fbf49109f5fb79a0334bab17a

lib/4.06.1/whole_compiler.ml

@@ -435103,9 +435103,7 @@ module Super_misc : sig
 #1 "super_misc.mli"
 (** Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
-val print_file: 
-  range:(int * int) * (int * int) ->
-  lines:string array -> Format.formatter -> unit -> unit
+val print_file: is_warning:bool -> range:(int * int) * (int * int) -> lines:string array -> Format.formatter -> unit -> unit
 
 end = struct
 #1 "super_misc.ml"
@@ -435147,7 +435145,7 @@ type current_printed_line_status =
 (* Range coordinates all 1-indexed, like for editors. Otherwise this code
   would have way too many off-by-one errors *)
 let print_file 
-
+~is_warning 
 (* start_line_start_char inclusive, end_line_end_char exclusive *)
 ~range:((start_line, start_line_start_char), (end_line, end_line_end_char)) 
 ~lines
@@ -435180,10 +435178,10 @@ ppf
   | Some n -> n
   in
   (* coloring *)
-  let highlighted_line_number : _ format = "@{<error>%s@}%a" in
+  let highlighted_line_number : _ format = if is_warning then "@{<info>%s@}%a" else "@{<error>%s@}%a" in
 
   let print_char_maybe_highlight ~begin_highlight_line ~end_highlight_line ch =
-    let highlighted_open_tag: _ format = "@{<error>" in
+    let highlighted_open_tag: _ format = if is_warning then "@{<info>" else "@{<error>" in
     if begin_highlight_line then fprintf ppf highlighted_open_tag;
     fprintf ppf "%c@," ch;
     if end_highlight_line then fprintf ppf "@}"
@@ -435324,8 +435322,12 @@ let print_loc ~normalizedRange ppf (loc : Location.t) =
   fprintf ppf "@{<filename>%a@}%a" print_filename loc.loc_start.pos_fname dim_loc normalizedRange
 ;;
 
-let print intro ppf (loc : Location.t) =
-    fprintf ppf "@[@{<error>%s@}@]@," intro;
+let print ~message_kind intro ppf (loc : Location.t) =
+    begin match message_kind with
+    | `warning -> fprintf ppf "@[@{<info>%s@}@]@," intro
+    | `warning_as_error -> fprintf ppf "@[@{<error>%s@} (configured as error) @]@," intro
+    | `error -> fprintf ppf "@[@{<error>%s@}@]@," intro
+    end;
     (* ocaml's reported line/col numbering is horrible and super error-prone
       when being handled programmatically (or humanly for that matter. If you're
       an ocaml contributor reading this: who the heck reads the character count
@@ -435359,7 +435361,7 @@ let print intro ppf (loc : Location.t) =
            branch might not be reached (aka no inline file content display) so
            we don't wanna end up with two line breaks in the the consequent *)
         fprintf ppf "@,%a"
-          (Super_misc.print_file  ~lines ~range)
+          (Super_misc.print_file ~is_warning:(message_kind=`warning) ~lines ~range)
           ()
       with
       (* this might happen if the file is e.g. "", "_none_" or any of the fake file name placeholders.
@@ -435373,7 +435375,7 @@ let print intro ppf (loc : Location.t) =
 let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
   setup_colors ();
   (* open a vertical box. Everything in our message is indented 2 spaces *)
-  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print  "We've found a bug for you!") loc msg;
+  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print ~message_kind:`error "We've found a bug for you!") loc msg;
   List.iter (Format.fprintf ppf "@,@[%a@]" super_error_reporter) sub
     (* no need to flush here; location's report_exception (which uses this ultimately) flushes *)
 
@@ -435383,10 +435385,11 @@ let rec super_error_reporter ppf ({loc; msg; sub} : Location.error) =
 let super_warning_printer loc ppf w =
   match Warnings.report w with
   | `Inactive -> ()
-  | `Active { Warnings. number = _; message = _;  sub_locs = _} ->
+  | `Active { Warnings. number = _; message = _; is_error; sub_locs = _} ->
     setup_colors ();
-    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
-      (print  ("Warning number " ^ (Warnings.number w |> string_of_int)))
+    let message_kind = if is_error then `warning_as_error else `warning in
+    Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
+      (print ~message_kind ("Warning number " ^ (Warnings.number w |> string_of_int)))
       loc
       (Warnings.message w);
     (* at this point, you can display sub_locs too, from e.g. https://github.com/ocaml/ocaml/commit/f6d53cc38f87c67fbf49109f5fb79a0334bab17a