fix poly variants with kind annots

Signed-off-by: David Vulakh <[email protected]>
janestreet · Oct 7, 2024 · 5dceabc · 5dceabc
1 parent 3fefbfa
commit 5dceabc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/lib/Fmt_ast.ml b/lib/Fmt_ast.ml
@@ -3743,17 +3743,22 @@ and fmt_type_declaration c ?ext ?(pre = "") ?name ?(eq = "=") {ast= decl; _}
   in
   let box_manifest k =
     hvbox c.conf.fmt_opts.type_decl_indent.v
-      ( str pre
-      $ fmt_extension_suffix c ext
-      $ str " "
-      $ hvbox_if
-          (not (List.is_empty ptype_params))
-          0
-          ( fmt_tydcl_params c ctx ptype_params
-          $ Option.value_map name ~default:(str txt) ~f:(fmt_longident_loc c)
-          $ fmt_opt
-              (Option.map ~f:(fmt_jkind_constr ~ctx:(Td decl) c) ptype_jkind)
-          )
+      ( hvbox_if
+          (Option.is_some ptype_jkind)
+          c.conf.fmt_opts.type_decl_indent.v
+          ( str pre
+          $ fmt_extension_suffix c ext
+          $ str " "
+          $ hvbox_if
+              (not (List.is_empty ptype_params))
+              0
+              ( fmt_tydcl_params c ctx ptype_params
+              $ Option.value_map name ~default:(str txt)
+                  ~f:(fmt_longident_loc c)
+              $ fmt_opt
+                  (Option.map
+                     ~f:(fmt_jkind_constr ~ctx:(Td decl) c)
+                     ptype_jkind ) ) )
       $ k )
   in
   let fmt_manifest_kind =

diff --git a/test/passing/tests/layout_annotation-erased.ml.js-ref b/test/passing/tests/layout_annotation-erased.ml.js-ref
@@ -13,8 +13,7 @@ type t_imm : immediate =
   | Bbbbbbbbbbbbbbbbbbbbb
   | Ccccccccccccccccccccc
 
-type t_imm :
-  immediate =
+type t_imm : immediate =
   [ `Aaaaaaaaaaaaaaaaaaaaa
   | `Bbbbbbbbbbbbbbbbbbbbb
   | `Ccccccccccccccccccccc

diff --git a/test/passing/tests/layout_annotation.ml.js-ref b/test/passing/tests/layout_annotation.ml.js-ref
@@ -13,8 +13,7 @@ type t_imm : immediate =
   | Bbbbbbbbbbbbbbbbbbbbb
   | Ccccccccccccccccccccc
 
-type t_imm :
-  immediate =
+type t_imm : immediate =
   [ `Aaaaaaaaaaaaaaaaaaaaa
   | `Bbbbbbbbbbbbbbbbbbbbb
   | `Ccccccccccccccccccccc

diff --git a/test/passing/tests/layout_annotation.ml.ref b/test/passing/tests/layout_annotation.ml.ref
@@ -18,8 +18,7 @@ type t_imm : immediate =
   | Bbbbbbbbbbbbbbbbbbbbb
   | Ccccccccccccccccccccc
 
-type t_imm :
-  immediate =
+type t_imm : immediate =
   [`Aaaaaaaaaaaaaaaaaaaaa | `Bbbbbbbbbbbbbbbbbbbbb | `Ccccccccccccccccccccc]
 
 type t_imm : immediate =