Merge pull request #1679 from TiagoMaiaL/fix-colon-fixit-for-function-signature

[Parser] Improve FixIt for function parameter with missing type (`name1 Name2`)

Author: ahoppen

Sources/SwiftParser/Parameters.swift

@@ -92,10 +92,30 @@ extension Parser {
     let modifiers = parseParameterModifiers(isClosure: false)
     let misplacedSpecifiers = parseMisplacedSpecifiers()
 
-    let names = self.parseParameterNames()
+    var names = self.parseParameterNames()
     let (unexpectedBeforeColon, colon) = self.expect(.colon)
 
-    let type = self.parseType(misplacedSpecifiers: misplacedSpecifiers)
+    let type: RawTypeSyntax
+
+    if colon.presence == .missing, let secondName = names.secondName, secondName.tokenText.isStartingWithUppercase {
+      // Synthesize the secondName parameter as a type node.
+      type = RawTypeSyntax(
+        RawSimpleTypeIdentifierSyntax(
+          name: secondName,
+          genericArgumentClause: nil,
+          arena: self.arena
+        )
+      )
+      names = ParameterNames(
+        unexpectedBeforeFirstName: names.unexpectedBeforeFirstName,
+        firstName: names.firstName,
+        unexpectedBeforeSecondName: nil,
+        secondName: nil
+      )
+    } else {
+      // Parse the type node as we would normally do.
+      type = self.parseType(misplacedSpecifiers: misplacedSpecifiers)
+    }
 
     let ellipsis = self.consumeIfContextualPunctuator("...", remapping: .ellipsis)
 

Tests/SwiftParserTest/translated/InvalidTests.swift

@@ -312,19 +312,19 @@ final class InvalidTests: XCTestCase {
       do {
         class Starfish {}
         struct Salmon {}
-        func f(s Starfish1️⃣,
+        func f(s 1️⃣Starfish,
                   _ ss: Salmon) -> [Int] {}
         func g() { f(Starfish(), Salmon()) }
       }
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected ':' and type in parameter", fixIts: ["insert ':' and type"])
+        DiagnosticSpec(message: "expected ':' in parameter", fixIts: ["insert ':'"])
       ],
       fixedSource: """
         do {
           class Starfish {}
           struct Salmon {}
-          func f(s Starfish: <#type#>,
+          func f(s: Starfish,
                     _ ss: Salmon) -> [Int] {}
           func g() { f(Starfish(), Salmon()) }
         }