Allow newline before ...rest parameter

Partial fix to #760
DanielXMoore · Oct 2, 2023 · eae5332 · eae5332
1 parent 589c43f
commit eae5332
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 1 deletion.
diff --git a/source/parser.hera b/source/parser.hera
@@ -1243,7 +1243,7 @@ NonEmptyParameters
 
 # https://262.ecma-international.org/#prod-FunctionRestParameter
 FunctionRestParameter
-  BindingRestElement:id TypeSuffix? ParameterElementDelimiter ->
+  __ BindingRestElement:id TypeSuffix? ParameterElementDelimiter ->
     return {
       type: "FunctionRestParameter",
       children: $0,

diff --git a/test/function.civet b/test/function.civet
@@ -836,6 +836,70 @@ describe "function", ->
     }
   """
 
+  describe "indented parameters", ->
+    testCase """
+      mixed
+      ---
+      (
+        a, b
+        c, d
+      ) => null
+      ---
+      (
+        a, b,
+        c, d
+      ) => null
+    """
+
+    testCase """
+      ...rest
+      ---
+      foo := (
+        x
+        ...rest
+      ) -> null
+      ---
+      function foo(
+        x,
+        ...rest
+      ) { return null }
+    """
+
+    testCase """
+      rest...
+      ---
+      foo := (
+        x
+        rest...
+      ) -> null
+      ---
+      function foo(
+        x,
+        ...rest
+      ) { return null }
+    """
+
+    // TODO: wrong indentation of }s
+    testCase """
+      indented with types
+      ---
+      function f<T>(
+        t:
+          item: T
+        u:
+          item: T
+      )
+      ---
+      function f<T>(
+        t: {
+          item: T
+      },
+        u: {
+          item: T
+      }
+      ){}
+    """
+
   describe "implicit returns", ->
     testCase """
       basic