Improve formatting of poly variant typexprs with attributes

Author: Iwan

src/res_printer.ml

@@ -1652,10 +1652,12 @@ and printTypExpr (typExpr : Parsetree.core_type) cmtTbl =
   | Ptyp_variant (rowFields, closedFlag, labelsOpt) ->
     let printRowField = function
     | Parsetree.Rtag ({txt}, attrs, true, []) ->
-      Doc.concat [
-        printAttributes attrs cmtTbl;
-        Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true txt]
-      ]
+      Doc.group (
+        Doc.concat [
+          printAttributes attrs cmtTbl;
+          Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true txt]
+        ]
+      )
     | Rtag ({txt}, attrs, truth, types) ->
       let doType t = match t.Parsetree.ptyp_desc with
       | Ptyp_tuple _ -> printTypExpr t cmtTbl
@@ -1664,11 +1666,13 @@ and printTypExpr (typExpr : Parsetree.core_type) cmtTbl =
       let printedTypes = List.map doType types in
       let cases = Doc.join ~sep:(Doc.concat [Doc.line; Doc.text "& "]) printedTypes in
       let cases = if truth then Doc.concat [Doc.line; Doc.text "& "; cases] else cases in
-      Doc.group (Doc.concat [
-        printAttributes attrs cmtTbl;
-        Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true txt];
-        cases
-      ])
+      Doc.group (
+        Doc.concat [
+          printAttributes attrs cmtTbl;
+          Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true txt];
+          cases
+        ]
+      )
     | Rinherit coreType ->
       printTypExpr coreType cmtTbl
     in

tests/printer/expr/__snapshots__/render.spec.js.snap

@@ -3191,6 +3191,24 @@ let r = #lident
 let r = #lident(a, b)
 let r = #\\\\\\"exotic lident\\"
 let r = #\\\\\\"exotic lident\\"(a, b)
+
+external openSync: (
+  path,
+  @bs.string
+  [
+    | @bs.as(\\"r\\") #Read
+    | @bs.as(\\"r+\\") #Read_write
+    | @bs.as(\\"rs+\\") #Read_write_sync
+    | @bs.as(\\"w\\") #Write
+    | @bs.as(\\"wx\\") #Write_fail_if_exists
+    | @bs.as(\\"w+\\") #Write_read
+    | @bs.as(\\"wx+\\") #Write_read_fail_if_exists
+    | @bs.as(\\"a\\") #Append
+    | @bs.as(\\"ax\\") #Append_fail_if_exists
+    | @bs.as(\\"a+\\") #Append_read
+    | @bs.as(\\"ax+\\") #Append_read_fail_if_exists
+  ],
+) => unit = \\"openSync\\"
 "
 `;
 

tests/printer/expr/polyvariant.js

@@ -103,3 +103,20 @@ let r = #lident
 let r = #lident(a, b)
 let r = #\"exotic lident"
 let r = #\"exotic lident"(a, b)
+
+external openSync: (
+  path,
+  @bs.string [
+    | @bs.as("r") #Read
+    | @bs.as("r+") #Read_write
+    | @bs.as("rs+") #Read_write_sync
+    | @bs.as("w") #Write
+    | @bs.as("wx") #Write_fail_if_exists
+    | @bs.as("w+") #Write_read
+    | @bs.as("wx+") #Write_read_fail_if_exists
+    | @bs.as("a") #Append
+    | @bs.as("ax") #Append_fail_if_exists
+    | @bs.as("a+") #Append_read
+    | @bs.as("ax+") #Append_read_fail_if_exists
+  ],
+) => unit = "openSync"