Add diagnostic for dictionary type

Author: kimdv

Sources/SwiftParser/Types.swift

@@ -1069,6 +1069,20 @@ extension Parser {
             arena: self.arena
           )
         )
+      } else if let colon = self.consume(if: .colon) {
+        let secondType = self.parseSimpleType()
+        let rightSquareBracket = self.consume(if: .rightSquareBracket) ?? self.missingToken(.rightSquareBracket)
+
+        result = RawTypeSyntax(
+          RawDictionaryTypeSyntax(
+            leftSquareBracket: self.missingToken(.leftSquareBracket),
+            keyType: result,
+            colon: colon,
+            valueType: secondType,
+            rightSquareBracket: rightSquareBracket,
+            arena: self.arena
+          )
+        )
       }
 
       var loopProgress = LoopProgressCondition()

Tests/SwiftParserTest/translated/RecoveryTests.swift

@@ -810,6 +810,7 @@ final class RecoveryTests: XCTestCase {
   }
 
   func testRecovery63() {
+
     assertParse(
       #"""
       struct SS 1️⃣SS : Multi {
@@ -831,7 +832,8 @@ final class RecoveryTests: XCTestCase {
           message: "expected ':' in type annotation",
           fixIts: ["insert ':'"]
         ),
-        DiagnosticSpec(locationMarker: "3️⃣", message: #"unexpected code ': Int = ""' before function"#),
+        DiagnosticSpec(
+            locationMarker: "3️⃣", message: #"unexpected code ': Int = ""' before function"#),
         DiagnosticSpec(
           locationMarker: "4️⃣",
           message: "expected ':' in type annotation",
@@ -1177,23 +1179,65 @@ final class RecoveryTests: XCTestCase {
     assertParse(
       """
       struct ErrorTypeInVarDeclDictionaryType {
-        let a1: String1️⃣:
-        let a2: String2️⃣: Int]
-        let a3: String3️⃣: [Int]
-        let a4: String4️⃣: Int
+        let a1: 1️⃣String:2️⃣
+        let a2: 3️⃣String: Int]
+        let a3: 4️⃣String: [Int]5️⃣
+        let a4: 6️⃣String: Int7️⃣
+        let a4: 8️⃣String: Int]??
       }
       """,
       diagnostics: [
-        // TODO: Old parser expected error on line 2: unexpected ':' in type; did you mean to write a dictionary type?, Fix-It replacements: 11 - 11 = '['
-        DiagnosticSpec(locationMarker: "1️⃣", message: "consecutive declarations on a line must be separated by ';'", fixIts: ["insert ';'"]),
-        DiagnosticSpec(locationMarker: "1️⃣", message: "unexpected code ':' before variable"),
-        // TODO: Old parser expected error on line 3: unexpected ':' in type; did you mean to write a dictionary type?, Fix-It replacements: 11 - 11 = '['
-        DiagnosticSpec(locationMarker: "2️⃣", message: "unexpected code ': Int]' before variable"),
-        // TODO: Old parser expected error on line 4: unexpected ':' in type; did you mean to write a dictionary type?, Fix-It replacements: 11 - 11 = '[', 24 - 24 = ']'
-        DiagnosticSpec(locationMarker: "3️⃣", message: "unexpected code ': [Int]' before variable"),
-        // TODO: Old parser expected error on line 5: unexpected ':' in type; did you mean to write a dictionary type?, Fix-It replacements: 11 - 11 = '[', 22 - 22 = ']'
-        DiagnosticSpec(locationMarker: "4️⃣", message: "unexpected code ': Int' in struct"),
-      ]
+        DiagnosticSpec(
+          locationMarker: "1️⃣",
+          message: "expected '[' to start dictionary type",
+          fixIts: ["insert '['"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "2️⃣",
+          message: "expected value type and ']' to end dictionary type",
+          fixIts: ["insert value type and ']'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "3️⃣",
+          message: "expected '[' to start dictionary type",
+          fixIts: ["insert '['"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "4️⃣",
+          message: "expected '[' to start dictionary type",
+          fixIts: ["insert '['"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "5️⃣",
+          message: "expected ']' to end dictionary type",
+          fixIts: ["insert ']'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "6️⃣",
+          message: "expected '[' to start dictionary type",
+          fixIts: ["insert '['"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "7️⃣",
+          message: "expected ']' to end dictionary type",
+          fixIts: ["insert ']'"]
+        ),
+        DiagnosticSpec(
+          locationMarker: "8️⃣",
+          message: "expected '[' to start dictionary type",
+          fixIts: ["insert '['"]
+        ),
+
+      ],
+      fixedSource: """
+        struct ErrorTypeInVarDeclDictionaryType {
+          let a1: [String: <#type#>]
+          let a2: [String: Int]
+          let a3: [String: [Int]]
+          let a4: [String: Int]
+          let a4: [String: Int]??
+        }
+        """
     )
   }