Better ignore doc comment

lib/Normalize_std_ast.ml

@@ -152,10 +152,50 @@ let make_mapper conf ~ignore_doc_comments =
     let typ = {typ with ptyp_loc_stack= []} in
     Ast_mapper.default_mapper.typ m typ
   in
+  let structure =
+    if ignore_doc_comments then fun (m : Ast_mapper.mapper) l ->
+      List.filter l ~f:(function
+        | {pstr_desc= Pstr_attribute a; _} -> not (is_doc a)
+        | _ -> true )
+      |> Ast_mapper.default_mapper.structure m
+    else Ast_mapper.default_mapper.structure
+  in
+  let signature =
+    if ignore_doc_comments then fun (m : Ast_mapper.mapper) l ->
+      List.filter l ~f:(function
+        | {psig_desc= Psig_attribute a; _} -> not (is_doc a)
+        | _ -> true )
+      |> Ast_mapper.default_mapper.signature m
+    else Ast_mapper.default_mapper.signature
+  in
+  let class_structure =
+    if ignore_doc_comments then fun (m : Ast_mapper.mapper) x ->
+      let pcstr_fields =
+        List.filter x.pcstr_fields ~f:(function
+          | {pcf_desc= Pcf_attribute a; _} -> not (is_doc a)
+          | _ -> true )
+      in
+      Ast_mapper.default_mapper.class_structure m {x with pcstr_fields}
+    else Ast_mapper.default_mapper.class_structure
+  in
+  let class_signature =
+    if ignore_doc_comments then fun (m : Ast_mapper.mapper) x ->
+      let pcsig_fields =
+        List.filter x.pcsig_fields ~f:(function
+          | {pctf_desc= Pctf_attribute a; _} -> not (is_doc a)
+          | _ -> true )
+      in
+      Ast_mapper.default_mapper.class_signature m {x with pcsig_fields}
+    else Ast_mapper.default_mapper.class_signature
+  in
   { Ast_mapper.default_mapper with
     location
   ; attribute
   ; attributes
+  ; structure
+  ; signature
+  ; class_signature
+  ; class_structure
   ; expr
   ; pat
   ; typ }

lib/Std_ast.ml

@@ -43,7 +43,12 @@ let map (type a) (x : a t) (m : Ast_mapper.mapper) : a -> a =
   match x with
   | Structure -> m.structure m
   | Signature -> m.signature m
-  | Use_file -> List.map ~f:(m.toplevel_phrase m)
+  | Use_file ->
+      List.filter_map ~f:(fun x ->
+          match m.toplevel_phrase m x with
+          | Ptop_def [] -> None
+          | Ptop_def _ as x -> Some x
+          | Ptop_dir _ as x -> Some x )
   | Core_type -> m.typ m
   | Module_type -> m.module_type m
   | Expression -> m.expr m

test/passing/dune.inc

@@ -5401,6 +5401,24 @@
  (package ocamlformat)
  (action (diff tests/verbose1.ml.err verbose1.ml.stderr)))
 
+(rule
+ (deps tests/.ocamlformat )
+ (package ocamlformat)
+ (action
+  (with-stdout-to w50.ml.stdout
+   (with-stderr-to w50.ml.stderr
+     (run %{bin:ocamlformat} --margin-check --no-comment-check -q --max-iters=3 %{dep:tests/w50.ml})))))
+
+(rule
+ (alias runtest)
+ (package ocamlformat)
+ (action (diff tests/w50.ml.ref w50.ml.stdout)))
+
+(rule
+ (alias runtest)
+ (package ocamlformat)
+ (action (diff tests/w50.ml.err w50.ml.stderr)))
+
 (rule
  (deps tests/.ocamlformat )
  (enabled_if (<> %{os_type} Win32))

test/passing/tests/w50.ml

@@ -0,0 +1,20 @@
+(* When using [--no-comment-check] (to format code despite warning 50),
+   We should not complain if doc-comments start appearing in the AST.
+*)
+
+module type T = sig
+val test_raises_some_exc : ('a -> 'b) -> 'a -> bool;;
+(** AAAA *)
+
+val test_raises_this_exc : exn -> ('a -> 'b) -> 'a -> bool;;
+(** BBBB *)
+end
+
+module T = struct
+
+let test_raises_some_exc = 2;;
+(** CCCC *)
+
+let test_raises_this_exc = 3;;
+(** DDDD *)
+end

test/passing/tests/w50.ml.opts

@@ -0,0 +1 @@
+--no-comment-check -q --max-iters=3

test/passing/tests/w50.ml.ref

@@ -0,0 +1,20 @@
+(* When using [--no-comment-check] (to format code despite warning 50), We
+   should not complain if doc-comments start appearing in the AST. *)
+
+module type T = sig
+  val test_raises_some_exc : ('a -> 'b) -> 'a -> bool
+
+  (** AAAA *)
+
+  val test_raises_this_exc : exn -> ('a -> 'b) -> 'a -> bool
+  (** BBBB *)
+end
+
+module T = struct
+  let test_raises_some_exc = 2
+
+  (** CCCC *)
+
+  (** DDDD *)
+  let test_raises_this_exc = 3
+end