Fix ';;' formatting between doc-comments and toplevel directives (#2432)

Author: gpetiot

CHANGES.md

@@ -31,6 +31,7 @@ Tags:
 - Fix dropped attributes on a begin-end in a match case (#2421, @Julow)
 - Fix non-stabilizing comments before a functor type argument (#2420, @Julow)
 - Fix crash caused by module types with nested `with module` (#2419, @Julow)
+- Fix ';;' formatting between doc-comments and toplevel directives (#2432, @gpetiot)
 
 ## 0.26.0 (2023-07-18)
 

lib/Fmt_ast.ml

@@ -4449,6 +4449,7 @@ let fmt_toplevel ?(force_semisemi = false) c ctx itms =
     let semisemi =
       match (itm, next) with
       | _, Some (`Item {pstr_desc= Pstr_eval _; _}, _) -> true
+      | `Item {pstr_desc= Pstr_attribute _; _}, _ -> false
       | `Item _, Some (`Directive _, _) -> true
       | _ -> force_semisemi && last
     in

test/passing/dune.inc

@@ -1586,6 +1586,24 @@
  (package ocamlformat)
  (action (diff tests/doc_repl.mld.err doc_repl.mld.stderr)))
 
+(rule
+ (deps tests/.ocamlformat )
+ (package ocamlformat)
+ (action
+  (with-stdout-to docstrings_toplevel_directives.mlt.stdout
+   (with-stderr-to docstrings_toplevel_directives.mlt.stderr
+     (run %{bin:ocamlformat} --margin-check %{dep:tests/docstrings_toplevel_directives.mlt})))))
+
+(rule
+ (alias runtest)
+ (package ocamlformat)
+ (action (diff tests/docstrings_toplevel_directives.mlt docstrings_toplevel_directives.mlt.stdout)))
+
+(rule
+ (alias runtest)
+ (package ocamlformat)
+ (action (diff tests/docstrings_toplevel_directives.mlt.err docstrings_toplevel_directives.mlt.stderr)))
+
 (rule
  (deps tests/.ocamlformat )
  (package ocamlformat)

test/passing/tests/docstrings_toplevel_directives.mlt

@@ -0,0 +1,11 @@
+(** Header *)
+
+#use "something"
+
+let two = 2
+
+[@@@warning "-labels-omitted"] ;;
+
+Clflags.strict_sequence := false
+
+let f () = x