Remove loc adjustment hack

Author: shulhi

compiler/syntax/src/res_core.ml

@@ -4905,28 +4905,14 @@ and parse_type_constructor_declaration_with_bar p =
         [doc_comment_to_attribute loc s]
       | _ -> []
     in
-    let has_doc_comment = not (doc_comment_attrs = []) in
     let start_pos = p.Parser.start_pos in
     Parser.next p;
     let constr = parse_type_constructor_declaration ~start_pos p in
-    let pcd_loc =
-      if has_doc_comment then
-        {
-          constr.Parsetree.pcd_loc with
-          loc_end =
-            {
-              constr.pcd_loc.loc_end with
-              pos_lnum = constr.pcd_loc.loc_end.pos_lnum + 1;
-            };
-        }
-      else constr.pcd_loc
-    in
     Some
       {
         constr with
         Parsetree.pcd_attributes =
           doc_comment_attrs @ constr.Parsetree.pcd_attributes;
-        pcd_loc;
       }
   | _ -> None
 
@@ -4964,27 +4950,10 @@ and parse_type_constructor_declarations ?first p =
           [doc_comment_to_attribute loc s]
         | _ -> []
       in
-      let has_doc_comment = not (doc_comment_attrs = []) 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
-      let pcd_loc =
-        if has_doc_comment then
-          {
-            constr.Parsetree.pcd_loc with
-            loc_end =
-              {
-                constr.pcd_loc.loc_end with
-                pos_lnum = constr.pcd_loc.loc_end.pos_lnum + 1;
-              };
-          }
-        else constr.pcd_loc
-      in
-      {
-        constr with
-        pcd_attributes = doc_comment_attrs @ constr.pcd_attributes;
-        pcd_loc;
-      }
+      {constr with pcd_attributes = doc_comment_attrs @ constr.pcd_attributes}
     | Some first_constr_decl -> first_constr_decl
   in
   first_constr_decl

compiler/syntax/src/res_printer.ml

@@ -340,7 +340,8 @@ let print_list ~get_loc ~nodes ~print ?(force_break = false) t =
     in
     Doc.breakable_group ~force_break docs
 
-let print_listi ~get_loc ~nodes ~print ?(force_break = false) t =
+let print_listi ~get_loc ~nodes ~print ?(ignore_empty_lines = false)
+    ?(force_break = false) t =
   let rec loop i (prev_loc : Location.t) acc nodes =
     match nodes with
     | [] -> (prev_loc, Doc.concat (List.rev acc))
@@ -352,8 +353,10 @@ 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
+          && not ignore_empty_lines
+        then Doc.concat [Doc.hard_line; Doc.hard_line]
         else Doc.line
       in
       let doc = print_comments (print node t i) t loc in
@@ -1542,18 +1545,22 @@ and print_constructor_declarations ~state ~private_flag
       ~print:(fun cd cmt_tbl i ->
         let doc = print_constructor_declaration2 ~state i cd cmt_tbl in
         print_comments doc cmt_tbl cd.Parsetree.pcd_loc)
-      ~force_break cmt_tbl
+      ~force_break cmt_tbl ~ignore_empty_lines:true
   in
   Doc.breakable_group ~force_break
     (Doc.indent (Doc.concat [Doc.line; private_flag; rows]))
 
 and print_constructor_declaration2 ~state i
     (cd : Parsetree.constructor_declaration) cmt_tbl =
-  let comment_attrs, attrs = ParsetreeViewer.partition_doc_comment_attributes cd.pcd_attributes in
+  let comment_attrs, attrs =
+    ParsetreeViewer.partition_doc_comment_attributes cd.pcd_attributes
+  in
   let comment_doc =
     match comment_attrs with
     | [] -> Doc.nil
-    | comment_attrs -> print_doc_comments ~sep:Doc.hard_line ~state cmt_tbl comment_attrs in
+    | comment_attrs ->
+      print_doc_comments ~sep:Doc.hard_line ~state cmt_tbl comment_attrs
+  in
   let attrs = print_attributes ~state attrs cmt_tbl in
   let is_dot_dot_dot = cd.pcd_name.txt = "..." in
   let bar =