WIP

Author: Shulhi Sapli

jscomp/syntax/src/res_parsetree_viewer.ml

@@ -1,5 +1,30 @@
 open Parsetree
 
+let attrs_string attrs =
+  List.map (fun (attr, _) -> print_endline attr.Asttypes.txt) attrs
+
+let ident_string ident =
+  match ident with
+  | Longident.Lident v -> v
+  | Longident.Ldot (_, v) -> v
+  | Longident.Lapply _ -> "Lapply"
+
+let print_ct ct =
+  match ct with
+  | {ptyp_desc = Ptyp_constr (ident, _); ptyp_attributes = attrs} ->
+    let _ =
+      print_endline
+        ("Ptyp_constr: " ^ ident_string ident.txt ^ " attrs: "
+        ^ string_of_int (List.length attrs))
+    in
+    let _ = attrs_string attrs in
+    ()
+  | {ptyp_desc = Ptyp_arrow _; ptyp_attributes = attrs} ->
+    print_endline
+      ("Ptyp_arrow: " ^ " attrs: " ^ string_of_int (List.length attrs))
+  | {ptyp_desc = Ptyp_variant _} -> print_endline "Ptyp_variant"
+  | _ -> print_endline "Something else"
+
 let arrow_type ?(arity = max_int) ct =
   let has_as_attr attrs =
     Ext_list.exists attrs (fun (x, _) -> x.Asttypes.txt = "as")

jscomp/syntax/src/res_parsetree_viewer.mli

@@ -8,6 +8,8 @@ val arrow_type :
   * (Parsetree.attributes * Asttypes.arg_label * Parsetree.core_type) list
   * Parsetree.core_type
 
+val print_ct : Parsetree.core_type -> unit
+
 val functor_type :
   Parsetree.module_type ->
   (Parsetree.attributes * string Asttypes.loc * Parsetree.module_type option)

jscomp/syntax/src/res_printer.ml

@@ -1591,6 +1591,7 @@ and print_label_declaration ~state (ld : Parsetree.label_declaration) cmt_tbl =
        ])
 
 and print_typ_expr ~(state : State.t) (typ_expr : Parsetree.core_type) cmt_tbl =
+  let parent_has_attrs = Ast_uncurried.core_type_is_uncurried_fun typ_expr  && not (typ_expr.ptyp_attributes = []) in
   let print_arrow ?(arity = max_int) typ_expr =
     let attrs_before, args, return_type =
       ParsetreeViewer.arrow_type ~arity typ_expr
@@ -1626,7 +1627,7 @@ and print_typ_expr ~(state : State.t) (typ_expr : Parsetree.core_type) cmt_tbl =
            [
              Doc.group attrs;
              Doc.group
-               (if has_attrs_before then
+               (if has_attrs_before || parent_has_attrs then
                   Doc.concat
                     [
                       Doc.lparen;