Merge pull request #1498 from kimdv/kimdv/fix-wrong-diagnostic

Fix wrong diagnostic for generics

Author: kimdv

Sources/SwiftParser/Declarations.swift

@@ -465,7 +465,7 @@ extension Parser {
     }
 
     precondition(self.currentToken.starts(with: "<"))
-    let langle = self.consumeAnyToken(remapping: .leftAngle)
+    let langle = self.consumePrefix("<", as: .leftAngle)
     var elements = [RawGenericParameterSyntax]()
     do {
       var keepGoing: RawTokenSyntax? = nil
@@ -477,7 +477,7 @@ extension Parser {
         var each = self.consume(if: .keyword(.each))
 
         let (unexpectedBetweenEachAndName, name) = self.expectIdentifier(allowSelfOrCapitalSelfAsIdentifier: true)
-        if attributes == nil && each == nil && unexpectedBetweenEachAndName == nil && name.isMissing && elements.isEmpty {
+        if attributes == nil && each == nil && unexpectedBetweenEachAndName == nil && name.isMissing && elements.isEmpty && !self.currentToken.starts(with: ">") {
           break
         }
 

Tests/SwiftParserTest/translated/RecoveryTests.swift

@@ -1066,7 +1066,7 @@ final class RecoveryTests: XCTestCase {
     assertParse(
       """
       // Note: Don't move braces to a different line here.
-      struct ErrorGenericParameterList4< 1️⃣
+      struct ErrorGenericParameterList4<1️⃣
       {
       }
       """,
@@ -2286,4 +2286,34 @@ final class RecoveryTests: XCTestCase {
     )
   }
 
+  // https://github.com/apple/swift-syntax/issues/1483
+  func testRecovery183() {
+    // Can be parsed and produces no diagnostics.
+    assertParse(
+      "func f< 1️⃣>() {}",
+      diagnostics: [
+        DiagnosticSpec(
+          message: "expected generic parameter in generic parameter clause",
+          fixIts: ["insert generic parameter"]
+        )
+      ],
+      fixedSource: """
+        func f<<#identifier#> >() {}
+        """
+    )
+
+    // Can be parsed. Printing the node or asking for the diagnostics leads to a crash.
+    assertParse(
+      "func f<1️⃣>() {}",
+      diagnostics: [
+        DiagnosticSpec(
+          message: "expected generic parameter in generic parameter clause",
+          fixIts: ["insert generic parameter"]
+        )
+      ],
+      fixedSource: """
+        func f<<#identifier#>>() {}
+        """
+    )
+  }
 }