fix f (g a begin end) (issue #2713) (#2715)

Author: EmileTrotignon

lib/Fmt_ast.ml

@@ -2340,14 +2340,14 @@ and fmt_expression c ?(box = true) ?(pro = noop) ?eol ?parens
           let pro =
             intro_epi
             $ fmt_if parens (str "(")
-            $ ( fmt_args_grouped ~epi:fmt_atrs e0 args_before
-              $ fmt_if parens (closing_paren c ~force ~offset:(-3)) )
+            $ fmt_args_grouped ~epi:fmt_atrs e0 args_before
           in
           let label_sep = Params.Exp.fun_label_sep c.conf in
           let pro = pro $ break 1 0 $ fmt_label lbl label_sep in
           expr_epi
           $ hovbox 4
-              (fmt_expression c ~pro ~box:false (sub_exp ~ctx last_arg))
+              ( fmt_expression c ~pro ~box:false (sub_exp ~ctx last_arg)
+              $ fmt_if parens (closing_paren c ~force ~offset:(-3)) )
       | _ ->
           let fmt_atrs =
             fmt_attributes c ~pre:(Break (1, -2)) pexp_attributes

test/passing/refs.ahrefs/exp_grouping-parens.ml.ref

@@ -578,3 +578,9 @@ let () =
              $ y
            in
            fooooooooooo x)
+
+let f () =
+  f
+    (g a (fun () ->
+       let x = y in
+       z))

test/passing/refs.ahrefs/exp_grouping.ml.ref

@@ -662,3 +662,10 @@ let () =
            in
            fooooooooooo x
          end
+
+let f () =
+  f
+    (g a begin fun () ->
+      let x = y in
+      z
+    end)

test/passing/refs.default/exp_grouping-parens.ml.ref

@@ -595,3 +595,9 @@ let () =
                $ y
              in
              fooooooooooo x)
+
+let f () =
+  f
+    (g a (fun () ->
+         let x = y in
+         z))

test/passing/refs.default/exp_grouping.ml.ref

@@ -680,3 +680,10 @@ let () =
              in
              fooooooooooo x
            end
+
+let f () =
+  f
+    (g a begin fun () ->
+        let x = y in
+        z
+      end)

test/passing/refs.janestreet/exp_grouping-parens.ml.ref

@@ -677,3 +677,10 @@ let () =
               in
               fooooooooooo x)
 ;;
+
+let f () =
+  f
+    (g a (fun () ->
+       let x = y in
+       z))
+;;

test/passing/refs.janestreet/exp_grouping.ml.ref

@@ -765,3 +765,11 @@ let () =
              fooooooooooo x
            end
 ;;
+
+let f () =
+  f
+    (g a begin fun () ->
+        let x = y in
+        z
+      end)
+;;

test/passing/refs.ocamlformat/exp_grouping-parens.ml.ref

@@ -599,3 +599,9 @@ let () =
                $ y
              in
              fooooooooooo x )
+
+let f () =
+  f
+    (g a (fun () ->
+         let x = y in
+         z ) )

test/passing/refs.ocamlformat/exp_grouping.ml.ref

@@ -686,3 +686,10 @@ let () =
              in
              fooooooooooo x
            end
+
+let f () =
+  f
+    (g a begin fun () ->
+        let x = y in
+        z
+      end )

test/passing/tests/exp_grouping.ml

@@ -547,3 +547,10 @@ let () =
              in
              fooooooooooo x
            end
+
+let f () =
+  f
+    (g a begin fun () ->
+        let x = y in
+        z
+      end )