Merge pull request #956 from hamishknight/review-comments

Author: hamishknight

Sources/SwiftParser/Declarations.swift

@@ -1121,11 +1121,7 @@ extension Parser {
     }
 
     // Detect an attempt to use a type parameter pack.
-    var unexpectedAfterName: RawUnexpectedNodesSyntax?
-    if let ellipsis = tryConsumeEllipsisPrefix() {
-      unexpectedAfterName = RawUnexpectedNodesSyntax(
-        elements: [RawSyntax(ellipsis)], arena: self.arena)
-    }
+    let ellipsis = tryConsumeEllipsisPrefix()
 
     // Parse optional inheritance clause.
     let inheritance: RawTypeInheritanceClauseSyntax?
@@ -1162,7 +1158,7 @@ extension Parser {
       associatedtypeKeyword: assocKeyword,
       unexpectedBeforeName,
       identifier: name,
-      unexpectedAfterName,
+      RawUnexpectedNodesSyntax([ellipsis], arena: self.arena),
       inheritanceClause: inheritance,
       initializer: defaultType,
       genericWhereClause: whereClause,

Sources/SwiftParser/Diagnostics/ParseDiagnosticsGenerator.swift

@@ -145,7 +145,8 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     addDiagnostic(incorrectContainer, message(misplacedTokens), fixIts: fixIts, handledNodes: [incorrectContainer.id] + correctAndMissingTokens.map(\.id))
   }
 
-  /// Utility function to remove a misplaced token with a custom error message.
+  /// If `unexpected` only contains a single token that satisfies `predicate`,
+  /// emits a diagnostic with `message` that removes this token.
   public func removeToken(
     _ unexpected: UnexpectedNodesSyntax?,
     where predicate: (TokenSyntax) -> Bool,