fix(grainfmt): Fix formatting of default argument types (#2081)

grain-lang · Mar 29, 2024 · 0c15e4a · 0c15e4a
1 parent 520dd8a
commit 0c15e4a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/compiler/src/formatting/fmt.re b/compiler/src/formatting/fmt.re
@@ -2538,8 +2538,7 @@ let print_parsed_type_argument = (fmt, arg) => {
   (
     switch (arg.ptyp_arg_label) {
     | Unlabeled => empty
-    | Labeled({txt: label, loc: label_loc})
-    | Default({txt: label, loc: label_loc}) =>
+    | Labeled({txt: label, loc: label_loc}) =>
       string(label)
       ++ string(":")
       ++ fmt.print_comment_range(
@@ -2550,6 +2549,18 @@ let print_parsed_type_argument = (fmt, arg) => {
            label_loc,
            arg.ptyp_arg_type.ptyp_loc,
          )
+    | Default({txt: label, loc: label_loc}) =>
+      string("?")
+      ++ string(label)
+      ++ string(":")
+      ++ fmt.print_comment_range(
+           fmt,
+           ~none=space,
+           ~lead=space,
+           ~trail=space,
+           label_loc,
+           arg.ptyp_arg_type.ptyp_loc,
+         )
     }
   )
   ++ fmt.print_type(fmt, arg.ptyp_arg_type);

diff --git a/compiler/test/grainfmt/function_params.expected.gr b/compiler/test/grainfmt/function_params.expected.gr
@@ -39,3 +39,5 @@ let stringTailMatcher = (toMatch, len) =>
   }
 
 let f: Number => (Number, Number) => Number = a => (b, c) => a + b + c
+
+let namedArg: (?suffix: String) => String = (suffix="") => suffix
diff --git a/compiler/test/grainfmt/function_params.input.gr b/compiler/test/grainfmt/function_params.input.gr
@@ -34,3 +34,5 @@ let stringTailMatcher =  (toMatch, len) =>
   }
 
 let f: Number -> (Number, Number) -> Number = a => (b, c) => a + b + c
+
+let namedArg: (?suffix: String) => String = (suffix="") => suffix