make color default to always

Author: bobzhang

jscomp/bsb/bsb_ninja_rule.ml

@@ -129,7 +129,7 @@ let make_custom_rules
       ~is_dev 
       ~postbuild : string =     
     Ext_buffer.clear buf;
-    Ext_buffer.add_string buf "$bsc -color always";
+    Ext_buffer.add_string buf "$bsc";
     Ext_buffer.add_ninja_prefix_var buf Bsb_ninja_global_vars.g_pkg_flg;
     if bs_suffix then
       Ext_buffer.add_string buf " -bs-suffix";
@@ -152,7 +152,7 @@ let make_custom_rules
   in   
   let mk_ast ~(has_pp : bool) ~has_ppx ~has_reason_react_jsx : string =
     Ext_buffer.clear buf ; 
-    Ext_buffer.add_string buf "$bsc  $warnings -color always";
+    Ext_buffer.add_string buf "$bsc  $warnings";
     (match refmt with 
     | None -> ()
     | Some x ->

jscomp/core/bs_conditional_initial.ml

@@ -36,7 +36,8 @@ let setup_env () =
   Clflags.compile_only := true;
   Config.bs_only := true;  
   Clflags.no_implicit_current_dir := true; 
-  (* default true 
+  Clflags.color := Some Always;
+  (* default true
      otherwise [bsc -I sc src/hello.ml ] will include current directory to search path
   *)
   Clflags.assume_no_mli := Clflags.Mli_non_exists;

jscomp/main/js_main.ml

@@ -302,16 +302,6 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "-o", string_optional_set Clflags.output_name, 
     "<file>  set output file name to <file>";
 
-    "-color", string_call set_color_option,
-    "Enable or disable colors in compiler messages\n\
-     The following settings are supported:\n\
-     auto    use heuristics to enable colors only if supported\n\
-     always  enable colors\n\
-     never   disable colors\n\
-     The default setting is 'auto', and the current heuristic\n\
-     checks that the TERM environment variable exists and is\n\
-     not empty or \"dumb\", and that isatty(stderr) holds.";    
-
      "-bs-read-cmi",  unit_call (fun _ -> Clflags.assume_no_mli := Mli_exists), 
      "*internal* Assume mli always exist ";
 
@@ -357,6 +347,8 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "*internal* Pass gentype command";
 
     (******************************************************************************)
+
+         
     "-bs-super-errors", unit_lazy Super_main.setup,
     "Better error message combined with other tools ";
 
@@ -381,6 +373,17 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "-bs-internal-check",  unit_call Bs_cmi_load.check,
     "*internal* Built in check corrupted data";  
 
+    "-color", string_call set_color_option,
+    "Enable or disable colors in compiler messages\n\
+     The following settings are supported:\n\
+     auto    use heuristics to enable colors only if supported\n\
+     always  enable colors\n\
+     never   disable colors\n\
+     The default setting is 'always'\n\
+     The current heuristic for 'auto'\n\
+     checks that the TERM environment variable exists and is\n\
+     not empty or \"dumb\", and that isatty(stderr) holds.";    
+
     "-bs-list-conditionals", unit_call (fun () -> Lexer.list_variables Format.err_formatter),
     "List existing conditional variables";