Format doc comment before bar

Author: shulhi

compiler/syntax/src/res_core.ml

@@ -4885,19 +4885,24 @@ and parse_constr_decl_args p =
  *  | constr-name const-args
  *  | attrs constr-name const-args *)
 and parse_type_constructor_declaration_with_bar p =
-  let doc_comment_attrs = match p.Parser.token with
-  | DocComment (loc, s) -> 
+  let doc_comment_attrs =
+    match p.Parser.token with
+    | DocComment (loc, s) ->
       Parser.next p;
       [doc_comment_to_attribute loc s]
-  | _ -> []
+    | _ -> []
   in
   match p.Parser.token with
   | Bar ->
     let start_pos = p.Parser.start_pos in
     Parser.next p;
-    let () = print_endline "3" in
     let constr = parse_type_constructor_declaration ~start_pos p in
-    Some ({constr with Parsetree.pcd_attributes = doc_comment_attrs @ constr.Parsetree.pcd_attributes})
+    Some
+      {
+        constr with
+        Parsetree.pcd_attributes =
+          doc_comment_attrs @ constr.Parsetree.pcd_attributes;
+      }
   | _ -> None
 
 and parse_type_constructor_declaration ~start_pos p =
@@ -4924,20 +4929,20 @@ and parse_type_constructor_declaration ~start_pos p =
 
 (* [|] constr-decl  { | constr-decl }   *)
 and parse_type_constructor_declarations ?first p =
-  let () = print_endline "2" in
   let first_constr_decl =
     match first with
     | None ->
-      let doc_comment_attrs = match p.Parser.token with
-      | DocComment (loc, s) -> 
+      let doc_comment_attrs =
+        match p.Parser.token with
+        | DocComment (loc, s) ->
           Parser.next p;
           [doc_comment_to_attribute loc s]
-      | _ -> []
+        | _ -> []
       in
       let start_pos = p.Parser.start_pos in
       ignore (Parser.optional p Token.Bar);
       let constr = parse_type_constructor_declaration ~start_pos p in
-      {constr with  pcd_attributes = doc_comment_attrs @ constr.pcd_attributes}
+      {constr with pcd_attributes = doc_comment_attrs @ constr.pcd_attributes}
     | Some first_constr_decl -> first_constr_decl
   in
   first_constr_decl
@@ -4964,7 +4969,6 @@ and parse_type_representation ?current_type_name_path ?inline_types_context p =
   let kind =
     match p.Parser.token with
     | Bar | Uident _ | DocComment _ ->
-      let () = print_endline "1" in
       Parsetree.Ptype_variant (parse_type_constructor_declarations p)
     | Lbrace ->
       Parsetree.Ptype_record
@@ -5518,7 +5522,6 @@ and parse_type_equation_and_representation ?current_type_name_path
         p
     | Private -> parse_private_eq_or_repr p
     | Bar | DotDot | DocComment _ ->
-      let () = print_endline "xxx" in
       (* DOCCOMMENT: Reached here if the first variant starts with |. 
          It is possible that the first variant may not have | (with multiple variants)
        *)
@@ -5627,7 +5630,6 @@ and parse_type_definitions ~current_type_name_path ~inline_types_context ~attrs
  * implemented for now. Needed to get a feel for the complexities of
  * this territory of the grammar *)
 and parse_type_definition_or_extension ~attrs p =
-  let () = print_endline "0" in
   let start_pos = p.Parser.start_pos in
   Parser.expect Token.Typ p;
   let rec_flag =

compiler/syntax/src/res_printer.ml

@@ -352,8 +352,7 @@ let print_listi ~get_loc ~nodes ~print ?(force_break = false) t =
         | Some comment -> (Comment.loc comment).loc_start
       in
       let sep =
-        if start_pos.pos_lnum - prev_loc.loc_end.pos_lnum > 1 then
-          Doc.concat [Doc.hard_line; Doc.hard_line]
+        if start_pos.pos_lnum - prev_loc.loc_end.pos_lnum > 1 then Doc.hard_line
         else Doc.line
       in
       let doc = print_comments (print node t i) t loc in
@@ -1550,12 +1549,35 @@ and print_constructor_declarations ~state ~private_flag
 and print_constructor_declaration2 ~state i
     (cd : Parsetree.constructor_declaration) cmt_tbl =
   let comment_attrs, attrs =
-    ParsetreeViewer.partition_doc_comment_attributes cd.pcd_attributes
+    List.partition
+      (fun ((id, payload) : Parsetree.attribute) ->
+        match (id, payload) with
+        | ( {txt = "res.doc"},
+            PStr
+              [
+                {
+                  pstr_desc =
+                    Pstr_eval
+                      ({pexp_desc = Pexp_constant (Pconst_string (_, _))}, _);
+                };
+              ] ) ->
+          true
+        | _ -> false)
+      cd.pcd_attributes
   in
   let comment_doc =
     match comment_attrs with
     | [] -> Doc.nil
-    | comment_attrs -> print_doc_comments ~state cmt_tbl comment_attrs
+    | comment_attrs ->
+      Doc.concat
+        [
+          Doc.group
+            (Doc.join_with_sep
+               (List.map
+                  (fun attr -> print_attribute ~state attr cmt_tbl)
+                  comment_attrs));
+          Doc.hard_line;
+        ]
   in
   let attrs = print_attributes ~state attrs cmt_tbl in
   let is_dot_dot_dot = cd.pcd_name.txt = "..." in
@@ -1579,8 +1601,8 @@ and print_constructor_declaration2 ~state i
   in
   Doc.concat
     [
-      bar;
       comment_doc;
+      bar;
       Doc.group
         (Doc.concat
            [