Skip to content

Commit 8f8c14f

Browse files
Janestreet profile: do not break fun _ -> function (#2460)
1 parent 5f5a541 commit 8f8c14f

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ profile. This started with version 0.26.0.
1010

1111
- Documentation comments are now formatted by default (#2390, @Julow)
1212
Use the option `parse-docstrings = false` to disable.
13+
- \* Janestreet profile: do not break `fun _ -> function` (#2460, @tdelvecchio-jsc)
1314

1415
### Fixed
1516

lib/Fmt_ast.ml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1386,9 +1386,7 @@ and fmt_fun ?force_closing_paren
13861386
let body =
13871387
let box =
13881388
match xbody.ast.pexp_desc with
1389-
| Pexp_fun _ | Pexp_newtype _ -> Some false
1390-
| Pexp_function _ when not c.conf.fmt_opts.ocp_indent_compat.v ->
1391-
Some false
1389+
| Pexp_fun _ | Pexp_newtype _ | Pexp_function _ -> Some false
13921390
| _ -> None
13931391
in
13941392
fmt_expression c ?box xbody

test/passing/tests/js_source.ml.ocp

+2-4
Original file line numberDiff line numberDiff line change
@@ -10168,8 +10168,7 @@ let _ =
1016810168
Foooooooooooooooooooo.foooooooooooooooooooo
1016910169
foooooooooooooooooooo
1017010170
foooooooooooooooooooo
10171-
(fun x ->
10172-
function
10171+
(fun x -> function
1017310172
| Foooooooooooooooooooo -> foooooooooooooooooooo
1017410173
| Foooooooooooooooooooo -> foooooooooooooooooooo)
1017510174
;;
@@ -10178,8 +10177,7 @@ let _ =
1017810177
Foooooooooooooooooooo.foooooooooooooooooooo
1017910178
foooooooooooooooooooo
1018010179
foooooooooooooooooooo
10181-
~x:(fun x ->
10182-
function
10180+
~x:(fun x -> function
1018310181
| Foooooooooooooooooooo -> foooooooooooooooooooo
1018410182
| Foooooooooooooooooooo -> foooooooooooooooooooo)
1018510183
;;

test/passing/tests/js_source.ml.ref

+6-8
Original file line numberDiff line numberDiff line change
@@ -10168,20 +10168,18 @@ let _ =
1016810168
Foooooooooooooooooooo.foooooooooooooooooooo
1016910169
foooooooooooooooooooo
1017010170
foooooooooooooooooooo
10171-
(fun x ->
10172-
function
10173-
| Foooooooooooooooooooo -> foooooooooooooooooooo
10174-
| Foooooooooooooooooooo -> foooooooooooooooooooo)
10171+
(fun x -> function
10172+
| Foooooooooooooooooooo -> foooooooooooooooooooo
10173+
| Foooooooooooooooooooo -> foooooooooooooooooooo)
1017510174
;;
1017610175

1017710176
let _ =
1017810177
Foooooooooooooooooooo.foooooooooooooooooooo
1017910178
foooooooooooooooooooo
1018010179
foooooooooooooooooooo
10181-
~x:(fun x ->
10182-
function
10183-
| Foooooooooooooooooooo -> foooooooooooooooooooo
10184-
| Foooooooooooooooooooo -> foooooooooooooooooooo)
10180+
~x:(fun x -> function
10181+
| Foooooooooooooooooooo -> foooooooooooooooooooo
10182+
| Foooooooooooooooooooo -> foooooooooooooooooooo)
1018510183
;;
1018610184

1018710185
let _ =

0 commit comments

Comments
 (0)