Skip to content

Expression quotes add spaces #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbachurski merged 1 commit into from
Apr 16, 2026
Merged

Expression quotes add spaces #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Fmt_ast.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3443,7 +3443,7 @@ and fmt_expression c ?(box = true) ?(pro = noop) ?eol ?parens
pro
$ hvbox 0
(Params.Exp.wrap c.conf ~parens
( wrap_fits_breaks ~space:true c.conf "<[" "]>"
( wrap_fits_breaks ~space:false c.conf "<[ " " ]>"
Comment thread
Skepfyr marked this conversation as resolved.
(fmt_expression c ~box ?eol ~parens:false ~indent_wrap ?ext
(sub_exp ~ctx expr) )
$ fmt_atrs ) )
Expand Down
16 changes: 8 additions & 8 deletions test/cli/syntax_quotations.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
$ echo '#syntax quotations off
> let c = $xyz' > soff.ml
$ ocamlformat --syntax-quotations a.ml
let c = <[123]> in
<[42 + $c]>
let c = <[ 123 ]> in
<[ 42 + $c ]>

$ ocamlformat a.ml
ocamlformat: ignoring "a.ml" (syntax error)
Expand All @@ -21,8 +21,8 @@
Error: Syntax error
[1]
$ ocamlformat --syntax-quotations a.ml
let c = <[123]> in
<[42 + $c]>
let c = <[ 123 ]> in
<[ 42 + $c ]>
$ ocamlformat qoff.ml
ocamlformat: ignoring "qoff.ml" (syntax error)
File "qoff.ml", line 2, characters 8-9:
Expand All @@ -42,14 +42,14 @@
$ ocamlformat qon.ml
#syntax quotations on;;

let c = <[123]> in
<[42 + $c]>
let c = <[ 123 ]> in
<[ 42 + $c ]>

$ ocamlformat --syntax-quotations qon.ml
#syntax quotations on;;

let c = <[123]> in
<[42 + $c]>
let c = <[ 123 ]> in
<[ 42 + $c ]>
$ ocamlformat soff.ml
ocamlformat: ignoring "soff.ml" (syntax error)
File "soff.ml", line 2, characters 8-9:
Expand Down
40 changes: 20 additions & 20 deletions test/passing/tests/quotations.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
#syntax quotations on

let simple_number = <[123]>
let simple_number = <[ 123 ]>

let npower x_quoted n =
let rec loop m = if m = 0 then <[1]> else <[$x_quoted * $(loop (m - 1))]> in
let rec loop m = if m = 0 then <[ 1 ]> else <[ $x_quoted * $(loop (m - 1)) ]> in
loop n
;;

let example_function n = <[fun x -> $(npower <[x]> n)]>
let example_function n = <[ fun x -> $(npower <[ x ]> n) ]>

let longer_example m n =
let first_quote = <[fun x -> $(npower <[x]> m)]> in
let second_quote = <[fun y -> $(npower <[y]> n)]> in
let combined_quote = <[fun x -> $second_quote ($first_quote x)]> in
<[$combined_quote, $combined_quote]>
let first_quote = <[ fun x -> $(npower <[ x ]> m) ]> in
let second_quote = <[ fun y -> $(npower <[ y ]> n) ]> in
let combined_quote = <[ fun x -> $second_quote ($first_quote x) ]> in
<[ $combined_quote, $combined_quote ]>
;;

let even_longer m n =
<[ fun x y ->
let xm = $(npower <[x]> m) in
let yn = $(npower <[y]> n) in
let xm = $(npower <[ x ]> m) in
let yn = $(npower <[ y ]> n) in
let z = xm + yn in
$(npower <[z]> (m + n)) ]>
$(npower <[ z ]> (m + n)) ]>
;;

type s = <[int]>
type t = s expr

let f (x : t) : <[$s * $s]> expr = <[$x, $x + 1]>
let f (x : t) : <[$s * $s]> expr = <[ $x, $x + 1 ]>

let double =
<[ let x = <[42]> in
<[123 + $x]> ]>
<[ let x = <[ 42 ]> in
<[ 123 + $x ]> ]>
;;

(* Long lines and breaks *)
Expand All @@ -50,12 +50,12 @@ let _ =
zzzzzzzzzzzzzzzzzzzzzzz ->
$( <[ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy ]>
, <[zzzzzzzzzzzzzzzzzzzzzzz]> ) ]>
, <[ zzzzzzzzzzzzzzzzzzzzzzz ]> ) ]>
;;

let _ =
let xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx =
<[fun aaaaaaaaaaaaaaaaaaaaa -> aaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa]>
<[ fun aaaaaaaaaaaaaaaaaaaaa -> aaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa ]>
in
<[ ( $xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
, $xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Expand All @@ -65,7 +65,7 @@ let _ =
let _ =
fun xxxxxxxxxxxxxxxxxxxx ->
<[ fun zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz ->
$((fun yyyyyyyyyyyyyyyyyyyy -> <[zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + 42]>)
$((fun yyyyyyyyyyyyyyyyyyyy -> <[ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + 42 ]>)
xxxxxxxxxxxxxxxxxxxx) ]>
;;

Expand Down Expand Up @@ -106,7 +106,7 @@ let _ =
$((* 6 *)
(fun (* 7 *)
(* 8 *) y (* 9 *) -> (* 10 *) y (* 11 *))
(* 12 *) <[(* 13 *) x (* 14 *)]> (* 15 *))
(* 12 *) <[ (* 13 *) x (* 14 *) ]> (* 15 *))
(* 16 *) ]>
;;

Expand All @@ -118,8 +118,8 @@ type 'a t = <[int (* 1 *) -> $('a (* 2 *) -> 'a (* 3 *) -> <[int]> (* 4 *)) (* 5
(* Attributes *)

let _ =
<[ (fun xxxxxxxxxxxxx -> (555555 + xxxxxxxxxxxxx) [@nontail]) 1111333333777777 [@inlined]
]>
<[ (fun xxxxxxxxxxxxx -> (555555 + xxxxxxxxxxxxx) [@nontail])
1111333333777777 [@inlined] ]>
;;

let _ = <[fun x -> $((fun y -> y) (<[x]> [@nontail])) [@inlined]]> [@boxed]
let _ = <[ fun x -> $((fun y -> y) (<[ x ]> [@nontail])) [@inlined] ]> [@boxed]
1 change: 0 additions & 1 deletion test/passing/tests/quotations.ml.err
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
Warning: tests/quotations.ml:120 exceeds the margin
40 changes: 20 additions & 20 deletions test/passing/tests/quotations.ml.js-ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
#syntax quotations on

let simple_number = <[123]>
let simple_number = <[ 123 ]>

let npower x_quoted n =
let rec loop m = if m = 0 then <[1]> else <[$x_quoted * $(loop (m - 1))]> in
let rec loop m = if m = 0 then <[ 1 ]> else <[ $x_quoted * $(loop (m - 1)) ]> in
loop n
;;

let example_function n = <[fun x -> $(npower <[x]> n)]>
let example_function n = <[ fun x -> $(npower <[ x ]> n) ]>

let longer_example m n =
let first_quote = <[fun x -> $(npower <[x]> m)]> in
let second_quote = <[fun y -> $(npower <[y]> n)]> in
let combined_quote = <[fun x -> $second_quote ($first_quote x)]> in
<[$combined_quote, $combined_quote]>
let first_quote = <[ fun x -> $(npower <[ x ]> m) ]> in
let second_quote = <[ fun y -> $(npower <[ y ]> n) ]> in
let combined_quote = <[ fun x -> $second_quote ($first_quote x) ]> in
<[ $combined_quote, $combined_quote ]>
;;

let even_longer m n =
<[ fun x y ->
let xm = $(npower <[x]> m) in
let yn = $(npower <[y]> n) in
let xm = $(npower <[ x ]> m) in
let yn = $(npower <[ y ]> n) in
let z = xm + yn in
$(npower <[z]> (m + n)) ]>
$(npower <[ z ]> (m + n)) ]>
;;

type s = <[int]>
type t = s expr

let f (x : t) : <[$s * $s]> expr = <[$x, $x + 1]>
let f (x : t) : <[$s * $s]> expr = <[ $x, $x + 1 ]>

let double =
<[ let x = <[42]> in
<[123 + $x]> ]>
<[ let x = <[ 42 ]> in
<[ 123 + $x ]> ]>
;;

(* Long lines and breaks *)
Expand All @@ -50,12 +50,12 @@ let _ =
zzzzzzzzzzzzzzzzzzzzzzz ->
$( <[ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy ]>
, <[zzzzzzzzzzzzzzzzzzzzzzz]> ) ]>
, <[ zzzzzzzzzzzzzzzzzzzzzzz ]> ) ]>
;;

let _ =
let xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx =
<[fun aaaaaaaaaaaaaaaaaaaaa -> aaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa]>
<[ fun aaaaaaaaaaaaaaaaaaaaa -> aaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa ]>
in
<[ ( $xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
, $xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Expand All @@ -65,7 +65,7 @@ let _ =
let _ =
fun xxxxxxxxxxxxxxxxxxxx ->
<[ fun zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz ->
$((fun yyyyyyyyyyyyyyyyyyyy -> <[zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + 42]>)
$((fun yyyyyyyyyyyyyyyyyyyy -> <[ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz + 42 ]>)
xxxxxxxxxxxxxxxxxxxx) ]>
;;

Expand Down Expand Up @@ -106,7 +106,7 @@ let _ =
$((* 6 *)
(fun (* 7 *)
(* 8 *) y (* 9 *) -> (* 10 *) y (* 11 *))
(* 12 *) <[(* 13 *) x (* 14 *)]> (* 15 *))
(* 12 *) <[ (* 13 *) x (* 14 *) ]> (* 15 *))
(* 16 *) ]>
;;

Expand All @@ -118,8 +118,8 @@ type 'a t = <[int (* 1 *) -> $('a (* 2 *) -> 'a (* 3 *) -> <[int]> (* 4 *)) (* 5
(* Attributes *)

let _ =
<[ (fun xxxxxxxxxxxxx -> (555555 + xxxxxxxxxxxxx) [@nontail]) 1111333333777777 [@inlined]
]>
<[ (fun xxxxxxxxxxxxx -> (555555 + xxxxxxxxxxxxx) [@nontail])
1111333333777777 [@inlined] ]>
;;

let _ = <[fun x -> $((fun y -> y) (<[x]> [@nontail])) [@inlined]]> [@boxed]
let _ = <[ fun x -> $((fun y -> y) (<[ x ]> [@nontail])) [@inlined] ]> [@boxed]
Loading