Parse class exprs and types without trailing semicolon

formatTest/typeCheckedTests/expected_output/attributes.re

@@ -261,28 +261,28 @@ class type addablePointClassType = {
       addablePointClassType,
       addablePointClassType
     ) =>
-    int
+    int;
 }
 [@structureItem]
 and anotherClassType = {
   pub foo: int;
-  pub bar: int
+  pub bar: int;
 };
 
 class type _x =
   [@bs]
   {
-    pub height: int
+    pub height: int;
   };
 
 class type _y = {
   [@bs.set]
-  pub height: int
+  pub height: int;
 };
 
 [@attr]
 class type _z = {
-  pub height: int
+  pub height: int;
 };
 
 module NestedModule = {
@@ -296,7 +296,7 @@ module type HasAttrs = {
   [@sigItem]
   class type foo = {
     pub foo: int;
-    pub bar: int
+    pub bar: int;
   };
   [@sigItem]
   class fooBar : (int) => foo;

formatTest/typeCheckedTests/expected_output/oo.re

@@ -209,7 +209,7 @@ class myClassWithAnnotatedReturnType
       (init)
       : {
           pub x: int;
-          pub y: int
+          pub y: int;
         } = {
   pub x: int = init;
   pub y = init;
@@ -221,7 +221,7 @@ class myClassWithAnnotatedReturnType2
       (init)
       : {
           pub x: int;
-          pub y: int
+          pub y: int;
         } = {
   pub x: int = init;
   pub y = init;
@@ -234,7 +234,7 @@ class myClassWithAnnotatedReturnType3
       (init)
       : {
           pub x: int;
-          pub y: int
+          pub y: int;
         } = {
   pub x: int = init;
   pub y: int = init;
@@ -263,7 +263,7 @@ class myClassWithAnnotatedReturnType3_annotated_constructor:
   (int) =>
   {
     pub x: int;
-    pub y: int
+    pub y: int;
   } =
   fun (init) => {
     pub x: int = init;
@@ -282,15 +282,15 @@ module HasTupleClasses: {
     (int) =>
     {
       pub x: int;
-      pub y: int
+      pub y: int;
     };
   /**
    * anotherExportedClass.
    */
   class anotherExportedClass ('a, 'b) :
     (('a, 'b)) =>
     {
-      pub pr: ('a, 'b)
+      pub pr: ('a, 'b);
     };
 } = {
   /**
@@ -363,7 +363,7 @@ class type addablePointClassType = {
       addablePointClassType,
       addablePointClassType
     ) =>
-    int
+    int;
 };
 
 /**

formatTest/unit_tests/expected_output/class_types.re

@@ -1,10 +1,29 @@
 class type _module ('provider_impl) = {};
 type t;
 class type bzz = {
-  inherit _module(t)
+  inherit _module(t);
 };
 
 class type t = {
   as 'a;
-  constraint 'a = #s
+  constraint 'a = #s;
+};
+
+/* https://github.com/facebook/reason/issues/2037 */
+class type xt = {
+  as 'a;
+};
+
+class x = {
+  as self;
+};
+
+class type classWithNoArgType = {
+  pub x: int;
+  pub y: int;
+};
+
+class classWithNoArg = {
+  pub x = 0;
+  pub y = 0;
 };

formatTest/unit_tests/expected_output/uncurried.re

@@ -82,7 +82,7 @@ class type _rect =
     pub height: int;
     [@bs.set]
     pub width: int;
-    pub draw: unit => unit
+    pub draw: unit => unit;
   };
 
 class type _rect =
@@ -92,7 +92,7 @@ class type _rect =
     pub height: int;
     [@bs.set]
     pub width: int;
-    pub draw: unit => unit
+    pub draw: unit => unit;
   };
 
 funWithCb("text", (.) => doStuff());

formatTest/unit_tests/expected_output/whitespace.rei

@@ -177,20 +177,20 @@ module X = MX;
 
 /** doc attr attached */
 class type x = {
-  pub height: int
+  pub height: int;
 };
 
 /** doc attr with newline */
 
 class type x = {
-  pub height: int
+  pub height: int;
 };
 
 /** doc attr with newline and comment */
 
 /* test */
 class type x = {
-  pub height: int
+  pub height: int;
 };
 
 /** doc attr attached */;

formatTest/unit_tests/input/class_types.re

@@ -9,3 +9,20 @@ class type bzz = {
 class type t = { as 'a;
   constraint 'a = #s
 };
+
+/* https://github.com/facebook/reason/issues/2037 */
+class type xt = { as 'a };
+
+class x = {
+  as self
+};
+
+class type classWithNoArgType {
+  pub x : int;
+  pub y : int
+};
+
+class classWithNoArg {
+  pub x = 0;
+  pub y = 0
+};