Fix missing parentheses around labelled tuple argument (#2811)

Author: Julow

CHANGES.md

@@ -21,6 +21,8 @@ profile. This started with version 0.26.0.
 - Fix lexer error on Windows when an Odoc code block contains CRLF line
   endings (@hhugo)
 
+- Fix missing parentheses in `(a, ~b:(if .. then .. else ..))` (#2811, @Julow)
+
 ## 0.29.0
 
 ### Highlight

lib/Ast.ml

@@ -2106,7 +2106,9 @@ end = struct
     memo
 
   let last_tuple_and_simple f l =
-    match List.last_exn l with Lte_simple l -> f l.lte_elt | _ -> false
+    match List.last_exn l with
+    | Lte_simple {lte_label= None; lte_elt} -> f lte_elt
+    | _ -> false
 
   (** [exposed cls exp] holds if there is a right-most subexpression of [exp]
       which satisfies [Exp.mem_cls cls] and is not parenthesized. *)

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

@@ -637,3 +637,11 @@ module type T = sig
     a ->
     'b
 end
+
+let func cond a b1 b2 = ~a, ~b:(if cond then b1 else b2)
+
+let func cond a b1 b2 =
+  ( a,
+    ~b:(match cond with
+       | true -> b1
+       | false -> b2) )

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

@@ -576,3 +576,6 @@ module type T = sig
     a ->
     'b
 end
+
+let func cond a b1 b2 = (~a, ~b:(if cond then b1 else b2))
+let func cond a b1 b2 = (a, ~b:(match cond with true -> b1 | false -> b2))

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

@@ -636,3 +636,12 @@ module type T = sig
     -> a
     -> 'b
 end
+
+let func cond a b1 b2 = ~a, ~b:(if cond then b1 else b2)
+
+let func cond a b1 b2 =
+  ( a
+  , ~b:(match cond with
+        | true -> b1
+        | false -> b2) )
+;;

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

@@ -643,3 +643,7 @@ module type T = sig
     -> a
     -> 'b
 end
+
+let func cond a b1 b2 = (~a, ~b:(if cond then b1 else b2))
+
+let func cond a b1 b2 = (a, ~b:(match cond with true -> b1 | false -> b2))

test/passing/tests/labeled_tuples.ml

@@ -664,4 +664,10 @@ module type T = sig
     -> tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt
     -> a
     -> 'b
-end
+end
+
+let func cond a b1 b2 =
+  (~a, ~b:(if cond then b1 else b2))
+
+let func cond a b1 b2 =
+  (a, ~b:(match cond with true -> b1 | false -> b2))