fix rebase conflicts and bugs

Author: dxu

formatTest/unit_tests/expected_output/comments.re

@@ -23,19 +23,17 @@ let testPostComment = "";
 let testMultiline a =>
   switch a {
   //  single line comment
-  | `Thingy x => {
-      print_string
-        /* multiline comment should be fine */
-        "matched thingy x";
-      let zz = 10;
-      // post line single line comment
-      zz
-    }
-  | `Other x => {
-      //  single line comment above
-      print_string "matched other x";
-      x
-    }
+  | `Thingy x =>
+    print_string
+      /* multiline comment should be fine */
+      "matched thingy x";
+    let zz = 10;
+    // post line single line comment
+    zz
+  | `Other x =>
+    //  single line comment above
+    print_string "matched other x";
+    x
   };
 
 //  single line comment below
@@ -66,14 +64,18 @@ let a = 10;
 let b = 20;
 
 /*A*/
-let named /* a::a */ a::a /* b::b */ b::b => /* a + b */ a + b;
+let named /* a::a */ a::a /* b::b */ b::b =>
+  /* a + b */
+  a + b;
 
 /*B*/
 let namedAlias
     /* a::aa */
     a::aa
     /* b::bb */
-    b::bb => /* aa + bb */ aa + bb;
+    b::bb =>
+  /* aa + bb */
+  aa + bb;
 
 /*C*/
 let namedAnnot

formatTest/unit_tests/expected_output/variants.re

@@ -142,8 +142,6 @@ let accessDeeplyWithArg x =>
 let rec accessDeeplyWithArgRecursive x count =>
   switch x {
   | LocalModule.AccessedThroughModuleWith x as entirePattern =>
-<<<<<<< 3fe786e63e3337d160facc736e0d5b9f8d6e4c06
-<<<<<<< 0bcab8d983cb43e7a26ab04b5c06a0781971c682
     /* It captures the whole pattern */
     if (count > 0) {
       0
@@ -159,26 +157,6 @@ let rec accessDeeplyWithArgRecursive x count =>
       accessDeeplyWithArgRecursive
         entirePattern (count - 1)
     }
-=======
-      // It captures the whole pattern
-=======
-      /* It captures the whole pattern */
->>>>>>> Revert "update old tests"
-      if (count > 0) {
-        0
-      } else {
-        accessDeeplyWithArgRecursive
-          entirePattern (count - 1)
-      }
-  | LocalModule.AccessedThroughModuleWithTwo x y as entirePattern =>
-      /* It captures the whole pattern */
-      if (count > 0) {
-        0
-      } else {
-        accessDeeplyWithArgRecursive
-          entirePattern (count - 1)
-      }
->>>>>>> update old tests
   };
 
 accessDeeplyWithArgRecursive
@@ -245,16 +223,10 @@ let rec commentPolymorphicCases:
   'a .
   option 'a => int
  =
-<<<<<<< 0bcab8d983cb43e7a26ab04b5c06a0781971c682
   fun
   | Some a => 1
   /* Comment on one */
   | None => 0;
-=======
-  fun | Some a => 1
-      /* Comment on one */
-      | None => 0;
->>>>>>> update old tests
 
 let thisWontCompileButLetsSeeHowItFormats =
   switch something {
@@ -278,20 +250,12 @@ type term _ =
   | App of (term ('b => 'a)) (term 'b) :term 'a;
 
 let rec eval: type a. term a => a =
-<<<<<<< 0bcab8d983cb43e7a26ab04b5c06a0781971c682
   fun
   | Int n => n
   /* a = int */
   | Add => (fun x y => x + y)
   /* a = int => int => int */
   | App f x => (eval f) (eval x);
-=======
-  fun | Int n => n
-      /* a = int */
-      | Add => (fun x y => x + y)
-      /* a = int => int => int */
-      | App f x => (eval f) (eval x);
->>>>>>> update old tests
 
 let rec eval: type a. term a => a =
   fun x =>