Fix a crash in diagnostic generation if a primary associated type is not ended with a >

In the new test case, we were parsing `:` as a right angle, which caused a crash when we were retrieving the token’s kind in diagnostic generation.

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift

@@ -413,7 +413,7 @@ public let DECL_NODES: [Node] = [
        ]),
 
   Node(name: "InheritedType",
-       nameForDiagnostics: "type",
+       nameForDiagnostics: "inherited type",
        kind: "Syntax",
        traits: [
          "WithTrailingComma"

Sources/SwiftParser/Nominals.swift

@@ -258,10 +258,18 @@ extension Parser {
           arena: self.arena))
       } while keepGoing != nil && loopProgress.evaluate(currentToken)
     }
-    let rangle = self.consumeAnyToken(remapping: .rightAngle)
+    let unexpectedBeforeRangle: RawUnexpectedNodesSyntax?
+    let rangle: RawTokenSyntax
+    if self.currentToken.starts(with: ">") {
+      unexpectedBeforeRangle = nil
+      rangle = self.consumePrefix(">", as: .rightAngle)
+    } else {
+      (unexpectedBeforeRangle, rangle) = self.expect(.rightAngle)
+    }
     return RawPrimaryAssociatedTypeClauseSyntax(
       leftAngleBracket: langle,
       primaryAssociatedTypeList: RawPrimaryAssociatedTypeListSyntax(elements: associatedTypes, arena: self.arena),
+      unexpectedBeforeRangle,
       rightAngleBracket: rangle,
       arena: self.arena)
   }

Sources/SwiftSyntax/gyb_generated/Misc.swift

@@ -828,7 +828,7 @@ extension SyntaxKind {
     case .declModifier:
       return "modifier"
     case .inheritedType:
-      return "type"
+      return "inherited type"
     case .inheritedTypeList:
       return nil
     case .typeInheritanceClause:

Tests/SwiftParserTest/DeclarationTests.swift

@@ -1333,6 +1333,19 @@ final class DeclarationTests: XCTestCase {
       ]
     )
   }
+
+  func testPrimaryAssociatedTypeNotTerminatedWithAngleBracket() {
+    AssertParse(
+      "protocol1️⃣<2️⃣:3️⃣",
+      diagnostics: [
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected identifier in protocol"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "expected name in primary associated type clause"),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "expected '>' to end primary associated type clause"),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "expected type in inherited type"),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "expected member block in protocol"),
+      ]
+  )
+  }
 }
 
 extension Parser.DeclAttributes {

gyb_syntax_support/DeclNodes.py

@@ -190,7 +190,7 @@
              Child('Detail', kind='DeclModifierDetail', is_optional=True),
          ]),
 
-    Node('InheritedType', name_for_diagnostics='type', kind='Syntax',
+    Node('InheritedType', name_for_diagnostics='inherited type', kind='Syntax',
          traits=['WithTrailingComma'],
          children=[
             Child('TypeName', kind='Type'),