Merge pull request #1467 from kimdv/kimdv/add-some-fix-its

Added missing fix its

Author: kimdv

Tests/SwiftParserTest/Assertions.swift

@@ -242,7 +242,7 @@ struct DiagnosticSpec {
   let notes: [NoteSpec]?
   /// If not `nil`, assert that the diagnostic contains fix-its with these messages.
   /// Use the `fixedSource` parameter on `AssertParse` to check that applying the Fix-It yields the expected result.
-  let fixIts: [String]?
+  let fixIts: [String]
 
   /// The file and line at which this `DiagnosticSpec` was created, so that assertion failures can be reported at its location.
   let file: StaticString
@@ -255,7 +255,7 @@ struct DiagnosticSpec {
     severity: DiagnosticSeverity = .error,
     highlight: String? = nil,
     notes: [NoteSpec]? = nil,
-    fixIts: [String]? = nil,
+    fixIts: [String] = [],
     file: StaticString = #file,
     line: UInt = #line
   ) {
@@ -434,15 +434,23 @@ func assertDiagnostic<T: SyntaxProtocol>(
       }
     }
   }
-  if let fixIts = spec.fixIts {
-    if fixIts != diag.fixIts.map(\.message.message) {
-      failStringsEqualWithDiff(
-        diag.fixIts.map(\.message.message).joined(separator: "\n"),
-        fixIts.joined(separator: "\n"),
-        file: file,
-        line: line
-      )
-    }
+
+  if diag.fixIts.count != spec.fixIts.count {
+    XCTFail(
+      """
+      Expected \(spec.fixIts.count) fix its but received \(diag.fixIts.count):
+      \(diag.fixIts.map { $0.message.message }.joined(separator: "\n"))
+      """,
+      file: file,
+      line: line
+    )
+  } else if spec.fixIts != diag.fixIts.map(\.message.message) {
+    failStringsEqualWithDiff(
+      diag.fixIts.map(\.message.message).joined(separator: "\n"),
+      spec.fixIts.joined(separator: "\n"),
+      file: file,
+      line: line
+    )
   }
 }
 

Tests/SwiftParserTest/AttributeTests.swift

@@ -60,9 +60,9 @@ final class AttributeTests: XCTestCase {
       @_specialize(e1️⃣
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected ':' in attribute argument"),
-        DiagnosticSpec(message: "expected ')' to end attribute"),
-        DiagnosticSpec(message: "expected declaration after attribute"),
+        DiagnosticSpec(message: "expected ':' in attribute argument", fixIts: ["insert ':'"]),
+        DiagnosticSpec(message: "expected ')' to end attribute", fixIts: ["insert ')'"]),
+        DiagnosticSpec(message: "expected declaration after attribute", fixIts: ["insert declaration"]),
       ]
     )
   }
@@ -73,9 +73,9 @@ final class AttributeTests: XCTestCase {
       @_specialize(e1️⃣, exported2️⃣)3️⃣
       """,
       diagnostics: [
-        DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in attribute argument"),
-        DiagnosticSpec(locationMarker: "2️⃣", message: "expected ': false' in attribute argument"),
-        DiagnosticSpec(locationMarker: "3️⃣", message: "expected declaration after attribute"),
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected ':' in attribute argument", fixIts: ["insert ':'"]),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "expected ': false' in attribute argument", fixIts: ["insert ': false'"]),
+        DiagnosticSpec(locationMarker: "3️⃣", message: "expected declaration after attribute", fixIts: ["insert declaration"]),
       ]
     )
   }
@@ -309,7 +309,7 @@ final class AttributeTests: XCTestCase {
   func testMissingDeclarationAfterAttributes() {
     assertParse(
       "@resultBuilder1️⃣",
-      diagnostics: [DiagnosticSpec(message: "expected declaration after attribute")],
+      diagnostics: [DiagnosticSpec(message: "expected declaration after attribute", fixIts: ["insert declaration"])],
       fixedSource: """
         @resultBuilder
         <#declaration#>
@@ -426,7 +426,7 @@ final class AttributeTests: XCTestCase {
       @_expose(Cxx, 1️⃣baz) func foo() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected string literal to end @_expose arguments"),
+        DiagnosticSpec(message: "expected string literal to end @_expose arguments", fixIts: ["insert string literal"]),
         DiagnosticSpec(message: "unexpected code 'baz' in attribute"),
       ]
     )
@@ -476,7 +476,7 @@ final class AttributeTests: XCTestCase {
       func foo() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected 'message' in @_unavailableFromAsync argument"),
+        DiagnosticSpec(message: "expected 'message' in @_unavailableFromAsync argument", fixIts: ["insert 'message'"]),
         DiagnosticSpec(message: "unexpected code 'nope' before @_unavailableFromAsync argument"),
       ]
     )
@@ -487,7 +487,7 @@ final class AttributeTests: XCTestCase {
       func foo() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected ':' and string literal in @_unavailableFromAsync argument"),
+        DiagnosticSpec(message: "expected ':' and string literal in @_unavailableFromAsync argument", fixIts: ["insert ':' and string literal"]),
         DiagnosticSpec(message: #"unexpected code '= "abc"' in attribute"#),
       ]
     )
@@ -498,7 +498,7 @@ final class AttributeTests: XCTestCase {
       func foo() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected string literal to end @_unavailableFromAsync argument"),
+        DiagnosticSpec(message: "expected string literal to end @_unavailableFromAsync argument", fixIts: ["insert string literal"]),
         DiagnosticSpec(message: "unexpected code 'abc' in attribute"),
       ]
     )

Tests/SwiftParserTest/AvailabilityTests.swift

@@ -149,7 +149,7 @@ final class AvailabilityTests: XCTestCase {
       func test() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected version tuple in version restriction"),
+        DiagnosticSpec(message: "expected version tuple in version restriction", fixIts: ["insert version tuple"]),
         DiagnosticSpec(message: "unexpected code '10e10' in attribute"),
       ]
     )
@@ -160,7 +160,7 @@ final class AvailabilityTests: XCTestCase {
       func test() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected integer literal in version tuple"),
+        DiagnosticSpec(message: "expected integer literal in version tuple", fixIts: ["insert integer literal"]),
         DiagnosticSpec(message: "unexpected code '0e10' in attribute"),
       ]
     )
@@ -171,7 +171,7 @@ final class AvailabilityTests: XCTestCase {
       func test() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected version tuple in version restriction"),
+        DiagnosticSpec(message: "expected version tuple in version restriction", fixIts: ["insert version tuple"]),
         DiagnosticSpec(message: "unexpected code '0xff' in attribute"),
       ]
     )
@@ -182,7 +182,7 @@ final class AvailabilityTests: XCTestCase {
       func test() {}
       """,
       diagnostics: [
-        DiagnosticSpec(message: "expected integer literal in version tuple"),
+        DiagnosticSpec(message: "expected integer literal in version tuple", fixIts: ["insert integer literal"]),
         DiagnosticSpec(message: "unexpected code '0xff' in attribute"),
       ]
     )