Fix precedence of tuples with labels (#2733)

Julow · web-flow · commit 43cfa9b388fe · 2025-10-23T16:02:18.000+02:00
* Fix precedence of tuples with labels

It was formatting:

    let labeled_tuple () = ~x:1, ~y:(1 + 2)

into:

    let labeled_tuple () = ~x:1, ~y:1 + 2

* Update CHANGES
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,12 @@ Items marked with an asterisk (\*) are changes that are likely to format
 existing code differently from the previous release when using the default
 profile. This started with version 0.26.0.
 
+## unreleased
+
+### Fixed
+
+- Fix crash with tuples of the form `~lbl:(1 + 2)` (#2732, #2733, @cod1r, @Julow)
+
 ## 0.28.0
 
 ### Highlight
diff --git a/lib/Ast.ml b/lib/Ast.ml
@@ -1664,6 +1664,16 @@ end = struct
     | {ast= Typ _; _} -> None
     | {ctx= Exp {pexp_desc; _}; ast= Exp exp} -> (
       match pexp_desc with
+      | Pexp_tuple elts
+        when List.exists
+               ~f:(function
+                 | Lte_pun _
+                  |Lte_simple {lte_label= None; _}
+                  |Lte_constrained_pun _ ->
+                     false
+                 | Lte_simple {lte_label= Some _; lte_elt} -> lte_elt == exp )
+               elts ->
+          Some (Apply, Right) (* Tuple element with a labels. *)
       | Pexp_tuple (Lte_simple {lte_elt= e0; _} :: _) ->
           Some (Comma, if exp == e0 then Left else Right)
       | Pexp_tuple (_ :: _) -> Some (Comma, Right)
diff --git a/test/passing/refs.ahrefs/labelled_args-414.ml.ref b/test/passing/refs.ahrefs/labelled_args-414.ml.ref
@@ -37,3 +37,19 @@ let () =
         very_long_argument_name_three
       -> ())
     foo
+
+let labeled_tuple () = ~x:1, ~y:(1 + 2)
+
+let ~x, .. = labeled_tuple ()
+
+let _ = ~x:1, ~y:(f 1)
+let _ = 1 + 2, 1 + 2
+let _ = 1 + 2, ~y:(1 + 2)
+let _ = 1 + 2, ~y
+let _ = 1 + 2, ~(y : t)
+
+(* No parens *)
+
+let _ = x, ~y:a.b
+let _ = x, ~y:a#.b
+let _ = x, ~y:a#b
diff --git a/test/passing/refs.ahrefs/labelled_args.ml.ref b/test/passing/refs.ahrefs/labelled_args.ml.ref
@@ -37,3 +37,19 @@ let () =
         very_long_argument_name_three
       -> ())
     foo
+
+let labeled_tuple () = ~x:1, ~y:(1 + 2)
+
+let ~x, .. = labeled_tuple ()
+
+let _ = ~x:1, ~y:(f 1)
+let _ = 1 + 2, 1 + 2
+let _ = 1 + 2, ~y:(1 + 2)
+let _ = 1 + 2, ~y
+let _ = 1 + 2, ~(y : t)
+
+(* No parens *)
+
+let _ = x, ~y:a.b
+let _ = x, ~y:a#.b
+let _ = x, ~y:a#b
diff --git a/test/passing/refs.default/labelled_args-414.ml.ref b/test/passing/refs.default/labelled_args-414.ml.ref
@@ -37,3 +37,17 @@ let () =
         very_long_argument_name_three
       -> ())
     foo
+
+let labeled_tuple () = (~x:1, ~y:(1 + 2))
+let ~x, .. = labeled_tuple ()
+let _ = (~x:1, ~y:(f 1))
+let _ = (1 + 2, 1 + 2)
+let _ = (1 + 2, ~y:(1 + 2))
+let _ = (1 + 2, ~y)
+let _ = (1 + 2, ~(y : t))
+
+(* No parens *)
+
+let _ = (x, ~y:a.b)
+let _ = (x, ~y:a#.b)
+let _ = (x, ~y:a#b)
diff --git a/test/passing/refs.default/labelled_args.ml.ref b/test/passing/refs.default/labelled_args.ml.ref
@@ -37,3 +37,17 @@ let () =
         very_long_argument_name_three
       -> ())
     foo
+
+let labeled_tuple () = (~x:1, ~y:(1 + 2))
+let ~x, .. = labeled_tuple ()
+let _ = (~x:1, ~y:(f 1))
+let _ = (1 + 2, 1 + 2)
+let _ = (1 + 2, ~y:(1 + 2))
+let _ = (1 + 2, ~y)
+let _ = (1 + 2, ~(y : t))
+
+(* No parens *)
+
+let _ = (x, ~y:a.b)
+let _ = (x, ~y:a#.b)
+let _ = (x, ~y:a#b)
diff --git a/test/passing/refs.janestreet/labelled_args-414.ml.ref b/test/passing/refs.janestreet/labelled_args-414.ml.ref
@@ -44,3 +44,17 @@ let () =
         very_long_argument_name_three -> ())
     foo
 ;;
+
+let labeled_tuple () = ~x:1, ~y:(1 + 2)
+let ~x, .. = labeled_tuple ()
+let _ = ~x:1, ~y:(f 1)
+let _ = 1 + 2, 1 + 2
+let _ = 1 + 2, ~y:(1 + 2)
+let _ = 1 + 2, ~y
+let _ = 1 + 2, ~(y : t)
+
+(* No parens *)
+
+let _ = x, ~y:a.b
+let _ = x, ~y:a#.b
+let _ = x, ~y:a#b
diff --git a/test/passing/refs.janestreet/labelled_args.ml.ref b/test/passing/refs.janestreet/labelled_args.ml.ref
@@ -44,3 +44,17 @@ let () =
         very_long_argument_name_three -> ())
     foo
 ;;
+
+let labeled_tuple () = ~x:1, ~y:(1 + 2)
+let ~x, .. = labeled_tuple ()
+let _ = ~x:1, ~y:(f 1)
+let _ = 1 + 2, 1 + 2
+let _ = 1 + 2, ~y:(1 + 2)
+let _ = 1 + 2, ~y
+let _ = 1 + 2, ~(y : t)
+
+(* No parens *)
+
+let _ = x, ~y:a.b
+let _ = x, ~y:a#.b
+let _ = x, ~y:a#b
diff --git a/test/passing/refs.ocamlformat/labelled_args-414.ml.ref b/test/passing/refs.ocamlformat/labelled_args-414.ml.ref
@@ -37,3 +37,25 @@ let () =
         very_long_argument_name_three
       -> () )
     foo
+
+let labeled_tuple () = (~x:1, ~y:(1 + 2))
+
+let ~x, .. = labeled_tuple ()
+
+let _ = (~x:1, ~y:(f 1))
+
+let _ = (1 + 2, 1 + 2)
+
+let _ = (1 + 2, ~y:(1 + 2))
+
+let _ = (1 + 2, ~y)
+
+let _ = (1 + 2, ~(y : t))
+
+(* No parens *)
+
+let _ = (x, ~y:a.b)
+
+let _ = (x, ~y:a#.b)
+
+let _ = (x, ~y:a#b)
diff --git a/test/passing/refs.ocamlformat/labelled_args.ml.ref b/test/passing/refs.ocamlformat/labelled_args.ml.ref
@@ -37,3 +37,25 @@ let () =
         very_long_argument_name_three
       -> () )
     foo
+
+let labeled_tuple () = (~x:1, ~y:(1 + 2))
+
+let ~x, .. = labeled_tuple ()
+
+let _ = (~x:1, ~y:(f 1))
+
+let _ = (1 + 2, 1 + 2)
+
+let _ = (1 + 2, ~y:(1 + 2))
+
+let _ = (1 + 2, ~y)
+
+let _ = (1 + 2, ~(y : t))
+
+(* No parens *)
+
+let _ = (x, ~y:a.b)
+
+let _ = (x, ~y:a#.b)
+
+let _ = (x, ~y:a#b)
diff --git a/test/passing/tests/labelled_args.ml b/test/passing/tests/labelled_args.ml
@@ -37,3 +37,21 @@ let () =
         very_long_argument_name_three
       -> () )
     foo
+
+let labeled_tuple () =
+  ~x:1,
+  ~y:(1 + 2)
+
+let ~x, .. = labeled_tuple ()
+
+let _ = ~x:1, ~y:(f 1)
+let _ = 1 + 2, 1 + 2
+let _ = 1 + 2, ~y:(1 + 2)
+let _ = 1 + 2, ~y
+let _ = 1 + 2, ~(y : t)
+
+(* No parens *)
+
+let _ = x, ~y:a.b
+let _ = x, ~y:a#.b
+let _ = x, ~y:a#b
