Merge pull request #1114 from slavapestov/fix-variadic-types

Fix parsing generic argument lists of variadic types in expression context

Author: slavapestov

Sources/SwiftParser/Types.swift

@@ -618,22 +618,26 @@ extension Parser.Lookahead {
       break
     }
 
-    guard self.isAtFunctionTypeArrow() else {
-      return true
-    }
+    if self.isAtFunctionTypeArrow() {
+      // Handle type-function if we have an '->' with optional
+      // 'async' and/or 'throws'.
+      var loopProgress = LoopProgressCondition()
+      while let (_, handle) = self.at(anyIn: EffectsSpecifier.self), loopProgress.evaluate(currentToken) {
+        self.eat(handle)
+      }
 
-    // Handle type-function if we have an '->' with optional
-    // 'async' and/or 'throws'.
-    var loopProgress = LoopProgressCondition()
-    while let (_, handle) = self.at(anyIn: EffectsSpecifier.self), loopProgress.evaluate(currentToken) {
-      self.eat(handle)
+      guard self.consume(if: .arrow) != nil else {
+        return false
+      }
+
+      return self.canParseType()
     }
 
-    guard self.consume(if: .arrow) != nil else {
-      return false
+    if self.currentToken.isEllipsis {
+      self.consumeAnyToken()
     }
 
-    return self.canParseType()
+    return true
   }
 
   mutating func canParseTupleBodyType() -> Bool {
@@ -822,14 +826,16 @@ extension Parser.Lookahead {
     }
 
     self.consumePrefix("<", as: .leftAngle)
-    var loopProgress = LoopProgressCondition()
-    repeat {
-      guard self.canParseType() else {
-        return false
-      }
-      // Parse the comma, if the list continues.
-    } while self.consume(if: .comma) != nil && loopProgress.evaluate(currentToken)
 
+    if !self.currentToken.starts(with: ">") {
+      var loopProgress = LoopProgressCondition()
+      repeat {
+        guard self.canParseType() else {
+          return false
+        }
+        // Parse the comma, if the list continues.
+      } while self.consume(if: .comma) != nil && loopProgress.evaluate(currentToken)
+    }
 
     guard self.currentToken.starts(with: ">") else {
       return false

Tests/SwiftParserTest/TypeTests.swift

@@ -374,6 +374,18 @@ final class TypeParameterPackTests: XCTestCase {
     func f1<T ...>(_ x: T ...) -> (T ...) {}
     """)
   }
+  func testVariadicTypes() {
+    AssertParse(
+    """
+    let _: G< > = G()
+    let _: G<T... > = G()
+    let _: G<Int, T... > = G()
+    let _ = G< >.self
+    let _ = G<T... >.self
+    let _ = G<Int, T... >.self
+    """)
+
+  }
 
   func testMissingCommaInType() throws {
     AssertParse(