Refactor

Author: shulhi

compiler/syntax/src/res_parsetree_viewer.ml

@@ -567,6 +567,23 @@ let filter_printable_attributes attrs = List.filter is_printable_attribute attrs
 let partition_printable_attributes attrs =
   List.partition is_printable_attribute attrs
 
+let partition_doc_comment_attributes attrs =
+  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)
+    attrs
+
 let is_fun_newtype expr =
   match expr.pexp_desc with
   | Pexp_fun _ | Pexp_newtype _ -> true

compiler/syntax/src/res_parsetree_viewer.mli

@@ -98,6 +98,8 @@ val has_printable_attributes : Parsetree.attributes -> bool
 val filter_printable_attributes : Parsetree.attributes -> Parsetree.attributes
 val partition_printable_attributes :
   Parsetree.attributes -> Parsetree.attributes * Parsetree.attributes
+val partition_doc_comment_attributes :
+  Parsetree.attributes -> Parsetree.attributes * Parsetree.attributes
 
 val requires_special_callback_printing_last_arg :
   (Asttypes.arg_label * Parsetree.expression) list -> bool

compiler/syntax/src/res_printer.ml

@@ -1550,35 +1550,12 @@ and print_constructor_declarations ~state ~private_flag
 and print_constructor_declaration2 ~state i
     (cd : Parsetree.constructor_declaration) cmt_tbl =
   let comment_attrs, attrs =
-    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
+    ParsetreeViewer.partition_doc_comment_attributes cd.pcd_attributes
   in
   let comment_doc =
     match comment_attrs with
     | [] -> Doc.nil
-    | 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;
-        ]
+    | comment_attrs -> print_doc_comments ~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
@@ -5601,6 +5578,15 @@ and print_bs_object_row ~state (lbl, expr) cmt_tbl =
   in
   print_comments doc cmt_tbl cmt_loc
 
+and print_doc_comments ~state cmt_tbl attrs =
+  Doc.concat
+    [
+      Doc.group
+        (Doc.join_with_sep
+           (List.map (fun attr -> print_attribute ~state attr cmt_tbl) attrs));
+      Doc.hard_line;
+    ]
+
 (* The optional loc indicates whether we need to print the attributes in
  * relation to some location. In practise this means the following:
  *  `@attr type t = string` -> on the same line, print on the same line
@@ -5613,21 +5599,7 @@ and print_attributes ?loc ?(inline = false) ~state
   | [] -> Doc.nil
   | attrs ->
     let comment_attrs, attrs =
-      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)
-        attrs
+      ParsetreeViewer.partition_doc_comment_attributes attrs
     in
     let line_break =
       match loc with
@@ -5642,16 +5614,7 @@ and print_attributes ?loc ?(inline = false) ~state
     let comment_doc =
       match comment_attrs with
       | [] -> Doc.nil
-      | 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;
-          ]
+      | comment_attrs -> print_doc_comments ~state cmt_tbl comment_attrs
     in
     let attrs_doc =
       match attrs with