Merge pull request #1591 from DanielXMoore/type-postfix-if-same-line

Type's postfix `if` must be on the same line
DanielXMoore · Nov 11, 2024 · 106e5da · 106e5da
2 parents 86f2b30 + 3e9fc54
commit 106e5da
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/source/parser.hera b/source/parser.hera
@@ -8304,7 +8304,7 @@ TypeBullet
     return list
 
 TypeWithPostfix
-  TypeConditional:t ( SameLineOrIndentedFurther TypeIfClause )?:postfix ->
+  TypeConditional:t ( _? TypeIfClause )?:postfix ->
     if (!postfix) return t
     return prepend(postfix[0],
       expressionizeTypeIf([ ...postfix[1], $1, undefined ]))

diff --git a/test/types/function.civet b/test/types/function.civet
@@ -414,6 +414,26 @@ describe "[TS] function", ->
     }
   """
 
+  // #1590
+  testCase """
+    not postfix if
+    ---
+    function fn(i: number): string
+      if i < 10
+        "a"
+      else
+        "b"
+    ---
+    function fn(i: number): string {
+      if (i < 10) {
+        return "a"
+      }
+      else {
+        return "b"
+      }
+    }
+  """
+
   describe "application", ->
     testCase """
       type arguments

diff --git a/test/types/type-declaration.civet b/test/types/type-declaration.civet
@@ -653,14 +653,13 @@ describe "[TS] type declaration", ->
       type Example1 = (Dog extends Animal?never: number)
     """
 
-    testCase """
+    throws """
       indented postfix if
       ---
       type Example1 = number
         if Dog extends Animal
       ---
-      type Example1 =
-        (Dog extends Animal? number:never)
+      ParseError
     """
 
   testCase """