fix CI

Author: bobzhang

jscomp/test/config2_test.ml

@@ -4,11 +4,11 @@
 
 class type v = object 
   method hey : int -> int -> int 
-end [@bs]
+end
 
 class type v2 = object
   method hey : int ->  int -> int 
-end [@bs]
+end
 
 type vv = 
    < 

jscomp/test/config2_test.mli

@@ -2,11 +2,11 @@
 
 class type v = object
   method hey : int -> int -> int 
-end [@bs]
+end 
 
 class type v2 = object
   method hey : int -> int -> int 
-end [@bs]
+end 
 
 type vv = 
   < 

jscomp/test/demo_binding.ml

@@ -2,51 +2,51 @@
 class type titlex = 
   object 
     method title : string [@@bs.set] [@@bs.get {null ; undefined}]
-  end[@bs]
+  end
 
 class type widget = 
   object 
       method on : string ->  (event -> unit [@bs]) -> unit 
-  end[@bs]
+  end
 and  event = 
   object 
     method source : widget
     method target : widget
-  end[@bs]
+  end
 
 
 class type title = 
   object 
     method title : string [@@bs.set]
-  end[@bs]
+  end
 
 class type text = 
   object
     method text : string [@@set]
-  end[@bs]
+  end
 
 class type measure =
     object
       method minHeight : int [@@set]
       method minWidth : int [@@bs.set]
       method maxHeight : int  [@@bs.set]
       method maxWidth : int [@@bs.set]
-    end[@bs]
+    end
 
 class type layout = 
     object 
       method orientation : string [@@bs.set]
-    end[@bs]
+    end
 
 class type applicationContext = 
   object 
     method exit : int -> unit 
-  end[@bs]
+  end
 class type contentable = 
   object
     method content : #widget  [@@bs.set]
     method contentWidth : int  [@@bs.set]
-  end[@bs]
+  end
 
 class type hostedWindow =
   object
@@ -57,13 +57,13 @@ class type hostedWindow =
     method hide : unit -> unit 
     method focus : unit -> unit 
     method appContext : applicationContext [@@bs.set]
-  end[@bs]
+  end
 
 class type hostedContent =
   object 
     inherit widget
     inherit contentable
-  end[@bs]
+  end
 
 
 class type stackPanel = 
@@ -74,7 +74,7 @@ class type stackPanel =
 
     method addChild : #widget  -> unit 
 
-  end[@bs]
+  end
 
 class type grid  = 
   object
@@ -85,22 +85,22 @@ class type grid  =
        <label : <text : string; .. >    ; ..>    array [@@bs.set]
     method dataSource :
        <label : <text : string; .. >   ; ..>    array array [@@bs.set]
-  end[@bs]
+  end
 
 
 class type button = 
   object
     inherit widget
     inherit text
     inherit measure
-  end[@bs]
+  end
 
 class type textArea = 
   object
     inherit widget
     inherit measure
     inherit text 
-  end[@bs]
+  end
 
 
 external set_interval : (unit -> unit [@bs]) -> float -> unit  =  "setInterval"

jscomp/test/gpr_1600_test.ml

@@ -9,25 +9,25 @@ let obj : < hi : (int * int -> unit [@bs.meth]) >   = object
 end [@bs]
 (** expect *)
 
-class type _a = object
+class type a = object
   method empty : unit -> unit
   method currentEvents : unit -> (string * string) array
   method push : string * string -> unit 
   method needRebuild : unit -> bool 
-end [@bs]
+end 
+
 
-type a = _a  
 
 let eventObj : < currentEvents : (unit -> (string * string) array [@bs.meth]);
     empty : (unit -> unit [@bs.meth]);
     needRebuild : (unit -> bool [@bs.meth]);
     push : (string * string -> unit [@bs.meth]) >
-   =  object (self)
+   =  object [@bs](self)
   val events : (string * string) array = [||]
   method empty () = ()
   method push a = Array.unsafe_set self##events 0 a 
   method needRebuild () = Array.length self##events <>  0
   method currentEvents () = self##events
-end [@bs]
+end 
 
 let f () = (eventObj : a)

jscomp/test/http_types.ml

@@ -19,17 +19,17 @@ class type _resp =
     method statusCode : int [@@bs.set]
     method setHeader : string -> string -> unit
     method _end : string -> unit 
-  end[@bs]
+  end
 type resp = _resp  
 class type _server = 
   object 
     method listen : int ->  string -> (unit -> unit [@bs]) -> unit
-  end[@bs]
+  end
 type server = _server  
 class type _http = 
   object 
     method createServer : (req  -> resp  -> unit [@bs]) ->  server
-  end[@bs]
+  end
 type http = _http 
 
 

jscomp/test/local_class_type.ml

@@ -1,11 +1,11 @@
 
 
 
-class type _u = object
+class type u = object
   method height : int [@@bs.set]
-end[@bs]
+end
+
 
-type u = _u 
 
 let f (x : u) = 
   x##height #= 3

jscomp/test/poly_type.ml

@@ -3,7 +3,7 @@
 
 class type history = object
   method pushState : 'a . 'a -> string  -> unit
-end [@bs]
+end 
 
 let f (x : history ) =
   x##pushState  3 "x";

jscomp/test/promise.ml

@@ -7,7 +7,7 @@ let f p =
   catch p 3
 
 class type ['b] promise =
-  object [@bs]
+  object 
     method _then : 'a -> 'b promise 
     method catch : 'a -> 'b
   end 

jscomp/test/test_bs_this.ml

@@ -24,12 +24,12 @@ let js_obj : 'self =
 
       }
   ]
-class type _x = object [@bs]
-  method onload : _x  -> unit [@this] [@@bs.set]
-  method addEventListener : string -> (_x  -> unit [@bs.this]) -> unit 
+class type x = object 
+  method onload : x  -> unit [@this] [@@bs.set]
+  method addEventListener : string -> (x  -> unit [@bs.this]) -> unit 
   method response : string
 end
-type x = _x  
+
 
 let f (x : x ) = 
   begin 

jscomp/test/test_index.ml

@@ -3,7 +3,7 @@
 class type ['a] case = object 
   method case : int -> 'a 
   method case__set : int -> 'a -> unit 
-end[@bs]
+end