Merge pull request #4108 from BuckleScript/continue_support_custom_refmt

fix warning concat to  avoid some edge cases

Author: bobzhang

jscomp/bsb/bsb_warning.ml

@@ -38,13 +38,25 @@ type nonrec t = t0 option
 
 let use_default = None
 
+let prepare_warning_concat ~(beg : bool) s =
+  let s = Ext_string.trim s in 
+  if s = "" then s 
+  else 
+    match s.[0] with 
+    | '0' .. '9' -> if beg then "-w +" ^ s else "+" ^ s 
+    | 'a' .. 'z' -> 
+      if beg then "-w " ^ s else "+" ^ s 
+    | _ -> 
+      if beg then "-w " ^ s else s
+
 let to_merlin_string x =
   "-w " ^ Bsc_warnings.defaults_w
   ^
   (match x with
    | Some {number =None}
    | None ->  Ext_string.empty
-   | Some {number = Some x} -> Ext_string.trim x )
+   | Some {number = Some x} -> 
+    prepare_warning_concat ~beg:false x )
 
 
 
@@ -75,19 +87,12 @@ let from_map (m : Ext_json_types.t Map_string.t) =
 let to_bsb_string ~toplevel warning =
   match warning with
   | None -> Ext_string.empty
-  | Some warning -> 
-    "-w " ^ Bsc_warnings.defaults_w ^
+  | Some warning ->     
     (match warning.number with
      | None ->
        Ext_string.empty
      | Some x ->
-       let content = 
-         Ext_string.trim x in 
-       if content = "" then content 
-       else 
-         match content.[0] with 
-         | '0' .. '9' -> "+" ^ content
-         | _ -> content
+       prepare_warning_concat ~beg:true x  
     ) ^
     if toplevel then 
       match warning.error with

lib/4.06.1/bsb.ml

@@ -7030,13 +7030,25 @@ type nonrec t = t0 option
 
 let use_default = None
 
+let prepare_warning_concat ~(beg : bool) s =
+  let s = Ext_string.trim s in 
+  if s = "" then s 
+  else 
+    match s.[0] with 
+    | '0' .. '9' -> if beg then "-w +" ^ s else "+" ^ s 
+    | 'a' .. 'z' -> 
+      if beg then "-w " ^ s else "+" ^ s 
+    | _ -> 
+      if beg then "-w " ^ s else s
+
 let to_merlin_string x =
   "-w " ^ Bsc_warnings.defaults_w
   ^
   (match x with
    | Some {number =None}
    | None ->  Ext_string.empty
-   | Some {number = Some x} -> Ext_string.trim x )
+   | Some {number = Some x} -> 
+    prepare_warning_concat ~beg:false x )
 
 
 
@@ -7067,19 +7079,12 @@ let from_map (m : Ext_json_types.t Map_string.t) =
 let to_bsb_string ~toplevel warning =
   match warning with
   | None -> Ext_string.empty
-  | Some warning -> 
-    "-w " ^ Bsc_warnings.defaults_w ^
+  | Some warning ->     
     (match warning.number with
      | None ->
        Ext_string.empty
      | Some x ->
-       let content = 
-         Ext_string.trim x in 
-       if content = "" then content 
-       else 
-         match content.[0] with 
-         | '0' .. '9' -> "+" ^ content
-         | _ -> content
+       prepare_warning_concat ~beg:true x  
     ) ^
     if toplevel then 
       match warning.error with

lib/4.06.1/unstable/bsb_native.ml

@@ -7030,13 +7030,25 @@ type nonrec t = t0 option
 
 let use_default = None
 
+let prepare_warning_concat ~(beg : bool) s =
+  let s = Ext_string.trim s in 
+  if s = "" then s 
+  else 
+    match s.[0] with 
+    | '0' .. '9' -> if beg then "-w +" ^ s else "+" ^ s 
+    | 'a' .. 'z' -> 
+      if beg then "-w " ^ s else "+" ^ s 
+    | _ -> 
+      if beg then "-w " ^ s else s
+
 let to_merlin_string x =
   "-w " ^ Bsc_warnings.defaults_w
   ^
   (match x with
    | Some {number =None}
    | None ->  Ext_string.empty
-   | Some {number = Some x} -> Ext_string.trim x )
+   | Some {number = Some x} -> 
+    prepare_warning_concat ~beg:false x )
 
 
 
@@ -7067,19 +7079,12 @@ let from_map (m : Ext_json_types.t Map_string.t) =
 let to_bsb_string ~toplevel warning =
   match warning with
   | None -> Ext_string.empty
-  | Some warning -> 
-    "-w " ^ Bsc_warnings.defaults_w ^
+  | Some warning ->     
     (match warning.number with
      | None ->
        Ext_string.empty
      | Some x ->
-       let content = 
-         Ext_string.trim x in 
-       if content = "" then content 
-       else 
-         match content.[0] with 
-         | '0' .. '9' -> "+" ^ content
-         | _ -> content
+       prepare_warning_concat ~beg:true x  
     ) ^
     if toplevel then 
       match warning.error with