improve printing of arrows with labelled arguments (#2778)

reasonml · Jul 29, 2024 · 4b74bb1 · 4b74bb1
1 parent b681d24
commit 4b74bb1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/src/reason-parser/reason_pprint_ast.ml b/src/reason-parser/reason_pprint_ast.ml
@@ -2512,9 +2512,12 @@ let printer = object(self:'self)
     let t = match lbl with
     | Nolabel -> typ
     | Labelled lbl ->
-        makeList ~sep:(Sep " ") [atom (namedArgSym ^ lbl ^ ":"); typ]
+        label ~space:true (atom (namedArgSym ^ lbl ^ ":")) typ
     | Optional lbl ->
-        makeList ~sep:(Sep " ") [atom (namedArgSym ^ lbl ^ ":"); label typ (atom "=?")]
+        label
+          ~space:true
+          (atom (namedArgSym ^ lbl ^ ":"))
+          (label typ (atom "=?"))
     in
     if uncurried then
       makeList ~postSpace:true [atom "."; t]

diff --git a/test/general-syntax-re.t/run.t b/test/general-syntax-re.t/run.t
@@ -76,8 +76,8 @@ Format general implementation syntax
     list(int);
   type firstTwoShouldBeGroupedAndFirstThree =
     (
-      ~first: (list(int) => list(int)) =>
-              list(int)
+      ~first:
+        (list(int) => list(int)) => list(int)
     ) =>
     list(int);
 
@@ -840,17 +840,16 @@ Format general implementation syntax
 
   type typeWithNestedNamedArgs =
     (
-      ~outerOne: (~innerOne: int, ~innerTwo: int) =>
-                 int,
+      ~outerOne:
+        (~innerOne: int, ~innerTwo: int) => int,
       ~outerTwo: int
     ) =>
     int;
 
   type typeWithNestedOptionalNamedArgs =
     (
-      ~outerOne: (~innerOne: int, ~innerTwo: int) =>
-                 int
-                   =?,
+      ~outerOne:
+        (~innerOne: int, ~innerTwo: int) => int=?,
       ~outerTwo: int=?
     ) =>
     int;

diff --git a/test/general-syntax-rei.t/input.rei b/test/general-syntax-rei.t/input.rei
@@ -52,3 +52,15 @@ module%foo X = Y;
 
 module%foo rec X: Y;
 
+let wrapReasonForJs:
+  (
+    ~component: componentSpec(
+                  'state,
+                  'initialState,
+                  'retainedProps,
+                  'initialRetainedPropssssssssssssssssss,
+                  'action
+                )
+  ) =>
+  reactClass;
+
diff --git a/test/general-syntax-rei.t/run.t b/test/general-syntax-rei.t/run.t
@@ -60,3 +60,16 @@ Format general interface syntax
   module%foo X = Y;
 
   module%foo rec X: Y;
+
+  let wrapReasonForJs:
+    (
+      ~component:
+        componentSpec(
+          'state,
+          'initialState,
+          'retainedProps,
+          'initialRetainedPropssssssssssssssssss,
+          'action,
+        )
+    ) =>
+    reactClass;