Fixes a bug in class type when trying to disable ocamlformat (#2525)

EmileTrotignon · web-flow · commit 169c480b54f8 · 2024-02-13T15:37:37.000+01:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -44,6 +44,7 @@ profile. This started with version 0.26.0.
 - Fix position of comments around and within `(type ...)` function arguments (#2503, @gpetiot)
 - Fix missing parentheses around constraint expressions with attributes (#2513, @alanechang)
 - Fix formatting of type vars in GADT constructors (#2518, @Julow)
+- Fix `[@ocamlformat "disable"]` inside `class type` constructs. (#2525, @EmileTrotignon)
 
 ## 0.26.1 (2023-09-15)
 
diff --git a/lib/Fmt_ast.ml b/lib/Fmt_ast.ml
@@ -178,6 +178,10 @@ let update_config_maybe_disabled c loc l f =
   let c = update_config c l in
   maybe_disabled c loc l f
 
+let update_config_maybe_disabled_k c loc l ~if_disabled enabled =
+  let c = update_config c l in
+  maybe_disabled_k c loc l enabled if_disabled
+
 let update_config_maybe_disabled_attrs c loc attrs f =
   let l = attrs.attrs_before @ attrs.attrs_after in
   update_config_maybe_disabled c loc l f
@@ -2874,7 +2878,8 @@ and fmt_class_type ?(pro = noop) c ({ast= typ; _} as xtyp) =
   protect c (Cty typ)
   @@
   let {pcty_desc; pcty_loc; pcty_attributes} = typ in
-  update_config_maybe_disabled c pcty_loc pcty_attributes
+  update_config_maybe_disabled_k c pcty_loc pcty_attributes
+    ~if_disabled:(fun fmt -> vbox 2 (pro $ fmt) )
   @@ fun c ->
   let doc, atrs = doc_atrs pcty_attributes in
   let parens = parenze_cty xtyp in
diff --git a/test/passing/dune.inc b/test/passing/dune.inc
@@ -1328,6 +1328,24 @@
  (package ocamlformat)
  (action (diff tests/disable_attr.ml.err disable_attr.ml.stderr)))
 
+(rule
+ (deps tests/.ocamlformat )
+ (package ocamlformat)
+ (action
+  (with-stdout-to disable_class_type.ml.stdout
+   (with-stderr-to disable_class_type.ml.stderr
+     (run %{bin:ocamlformat} --margin-check %{dep:tests/disable_class_type.ml})))))
+
+(rule
+ (alias runtest)
+ (package ocamlformat)
+ (action (diff tests/disable_class_type.ml disable_class_type.ml.stdout)))
+
+(rule
+ (alias runtest)
+ (package ocamlformat)
+ (action (diff tests/disable_class_type.ml.err disable_class_type.ml.stderr)))
+
 (rule
  (deps tests/.ocamlformat )
  (package ocamlformat)
diff --git a/test/passing/tests/disable_class_type.ml b/test/passing/tests/disable_class_type.ml
@@ -0,0 +1,8 @@
+class type c =
+  let open [@ocamlformat "disable"] Z
+  in
+z
+
+class type c =
+  object [@ocamlformat "disable"]
+         end
