Restore wilBreak functionality.

Author: cristianoc

src/res_doc.ml

@@ -115,7 +115,7 @@ let rec willBreak doc =
   | LineBreak (Hard | Literal) | BreakParent | Group {shouldBreak = true} ->
     true
   | Group {doc} | Indent doc -> willBreak doc
-  | CustomLayout {groups = _lazyDoc :: _} -> false
+  | CustomLayout {groups = lazyDoc :: _} -> willBreak (Lazy.force lazyDoc)
   | Concat docs -> List.exists willBreak docs
   | IfBreaks {yes; no} -> willBreak yes || willBreak no
   | _ -> false

tests/conversion/reason/expected/bracedJsx.res.txt

@@ -112,7 +112,8 @@ let make = () => {
       className=Styles.terminal
       onClick={event => (event->ReactEvent.Mouse.target)["querySelector"]("input")["focus"]()}
       ref={containerRef->ReactDOMRe.Ref.domRef}>
-      {state.history->Array.mapWithIndex((index, item) =>
+      {state.history
+      ->Array.mapWithIndex((index, item) =>
         <div key={j`$index`} className=Styles.line>
           {ReasonReact.string(
             switch item {
@@ -121,7 +122,8 @@ let make = () => {
             },
           )}
         </div>
-      )->ReasonReact.array}
+      )
+      ->ReasonReact.array}
       <div>
         {userPrefix->ReasonReact.string}
         {<input

tests/conversion/reason/expected/fastPipe.res.txt

@@ -15,9 +15,9 @@ let x = @attr ((@attr2 a)->f(b)->c(d))
 Route.urlToRoute(url)->ChangeView->self.send
 
 let aggregateTotal = (forecast, ~audienceType) =>
-  Js.Nullable.toOption(forecast["audiences"])->Option.flatMap(item =>
-    Js.Dict.get(item, audienceType)
-  )->Option.map(item => {
+  Js.Nullable.toOption(forecast["audiences"])
+  ->Option.flatMap(item => Js.Dict.get(item, audienceType))
+  ->Option.map(item => {
     pages: item["reach"]["pages"],
     views: item["reach"]["views"],
     sample: item["reach"]["sample"],

tests/printer/expr/expected/binary.res.txt

@@ -481,9 +481,9 @@ foo :=
   ) |> Array.of_list |> ReasonReact.array} </div>
 
 let aggregateTotal = (forecast, ~audienceType) =>
-  Js.Nullable.toOption(forecast["audiences"])->Option.flatMap(item =>
-    Js.Dict.get(item, audienceType)
-  )->Option.map(item => {
+  Js.Nullable.toOption(forecast["audiences"])
+  ->Option.flatMap(item => Js.Dict.get(item, audienceType))
+  ->Option.map(item => {
     pages: item["reach"]["pages"],
     views: item["reach"]["views"],
     sample: item["reach"]["sample"],
@@ -492,13 +492,13 @@ let aggregateTotal = (forecast, ~audienceType) =>
 React.useEffect4(() => {
   switch (context.library, context.account) {
   | (Some(library), Some(account)) =>
-    library.getBalance(. account)->Promise.Js.catch(_ => {Promise.resolved(None)})->Promise.get(
-      newBalance => {
-        dispatch(LoadAddress(account, newBalance->Belt.Option.flatMap(balance =>
-              Eth.make(balance.toString(.))
-            )))
-      },
-    )
+    library.getBalance(. account)
+    ->Promise.Js.catch(_ => {Promise.resolved(None)})
+    ->Promise.get(newBalance => {
+      dispatch(LoadAddress(account, newBalance->Belt.Option.flatMap(balance =>
+            Eth.make(balance.toString(.))
+          )))
+    })
 
     None
   | _ => None

tests/printer/expr/expected/callback.res.txt

@@ -179,13 +179,17 @@ foo(list => list())
 foo(\"switch" => \"switch"())
 
 // the [] of the array should break
-[fn(x => {
+[
+  fn(x => {
     let _ = x
-  }), fn(y => {
+  }),
+  fn(y => {
     let _ = y
-  }), fn(z => {
+  }),
+  fn(z => {
     let _ = z
-  })]
+  }),
+]
 
 // similar, the jsx tree should be broken over multiple lines
 let f = () => {
@@ -196,9 +200,13 @@ let f = () => {
     | Done(Error(_)) => "Error"->React.string
     | Done(Ok(users)) =>
       <>
-        <ul> {users->Array.map(user => {
+        <ul>
+          {users
+          ->Array.map(user => {
             <li key=user.id> {user.username->React.string} </li>
-          })->React.array} </ul>
+          })
+          ->React.array}
+        </ul>
         {reloadableUser.last->AsyncData.isLoading ? "Loading next page"->React.string : React.null}
         <button onClick={_ => setPage(x => x + 1)}> {"Load next page"->React.string} </button>
       </>
@@ -217,9 +225,10 @@ myPromise->Js.Promise.then_(value => {
   Js.Promise.resolve(-2)
 }, _)
 
-let decoratorTags = items->Js.Array2.filter(items => {
-    items.category === Decorators
-  })->Belt.Array.map(item => {
+let decoratorTags =
+  items
+  ->Js.Array2.filter(items => {items.category === Decorators})
+  ->Belt.Array.map(item => {
     <span className="mr-2" key=item.name>
       <Tag text={item.name} />
     </span>

tests/printer/expr/expected/let.res.txt

@@ -47,7 +47,11 @@ let f = x => {
     ->Option.flatMap(Js.Json.decodeString)
     ->Option.map(Js.Date.fromString)
 
-  let b = x->Js.Dict.get("wm-property")->Option.flatMap(Js.Json.decodeString)->Option.flatMap(x =>
+  let b =
+    x
+    ->Js.Dict.get("wm-property")
+    ->Option.flatMap(Js.Json.decodeString)
+    ->Option.flatMap(x =>
       switch x {
       | "like-of" => Some(#like)
       | "repost-of" => Some(#repost)