Fix bug that caused necessary braces to be removed (#2481)

reasonml · Oct 29, 2019 · affdf4c · affdf4c
1 parent b555665
commit affdf4c
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/formatTest/unit_tests/expected_output/jsx.re b/formatTest/unit_tests/expected_output/jsx.re
@@ -677,3 +677,35 @@ let v =
       }),
   }
 />;
+
+<Component
+  prop={
+    name:
+      x
+      ++ Option.map(x => {
+           let y = x;
+           y ++ y;
+         }),
+  }
+/>;
+
+<Component
+  prop={
+    name:
+      x##Option.map(x => {
+        let y = x;
+        y ++ y;
+      }),
+  }
+/>;
+
+<Component
+  prop={
+    name:
+      x
+      |> Option.map(x => {
+           let y = x;
+           y ++ y;
+         }),
+  }
+/>;
diff --git a/formatTest/unit_tests/input/jsx.re b/formatTest/unit_tests/input/jsx.re
@@ -544,3 +544,21 @@ let v =
     name: x->Option.map(x => {let y = x; y ++ y})
   }}
 />;
+
+<Component
+  prop={{
+    name: x ++ Option.map(x => {let y = x; y ++ y})
+  }}
+/>;
+
+<Component
+  prop={{
+    name: x##Option.map(x => {let y = x; y ++ y})
+  }}
+/>;
+
+<Component
+  prop={{
+    name: x |> Option.map(x => {let y = x; y ++ y})
+  }}
+/>;
diff --git a/src/reason-parser/reason_pprint_ast.ml b/src/reason-parser/reason_pprint_ast.ml
@@ -3753,7 +3753,7 @@ let printer = object(self:'self)
               {exp with pexp_loc = { exp.pexp_loc with loc_end = loc_end } }
             in
             makeList (
-              self#reset_request_braces#formatFunAppl
+              self#formatFunAppl
                 ?prefix
                 ~jsxAttrs:[]
                 ~args
@@ -3967,6 +3967,7 @@ let printer = object(self:'self)
     match self#simplest_expression x with
     | Some se -> Simple se
     | None ->
+    let self = self#reset_request_braces in
     match x.pexp_desc with
     | Pexp_apply (e, ls) -> (
       let ls = List.map (fun (l,expr) -> (l, self#process_underscore_application expr)) ls in