Allow exchanging tokens when there are also unrelated unexpected tokens

Author: nickolas-pohilets

Sources/SwiftParserDiagnostics/ParseDiagnosticsGenerator.swift

@@ -168,12 +168,9 @@ public class ParseDiagnosticsGenerator: SyntaxAnyVisitor {
     moveFixIt: (_ misplacedTokens: [TokenSyntax]) -> FixItMessage,
     removeRedundantFixIt: (_ misplacedTokens: [TokenSyntax]) -> FixItMessage? = { _ in nil }
   ) {
-    guard let incorrectContainer = unexpected,
-      let misplacedTokens = incorrectContainer.onlyPresentTokens(satisfying: unexpectedTokenCondition)
-    else {
-      // If there are no unexpected nodes or the unexpected contain multiple tokens, don't emit a diagnostic.
-      return
-    }
+    guard let incorrectContainer = unexpected else { return }
+    let misplacedTokens = incorrectContainer.presentTokens(satisfying: unexpectedTokenCondition)
+    if misplacedTokens.isEmpty { return }
 
     let correctTokens = correctTokens.compactMap({ $0 })
 

Tests/SwiftParserTest/translated/InitDeinitTests.swift

@@ -642,7 +642,26 @@ final class InitDeinitTests: XCTestCase {
         """
     )
   }
-    
+  
+  func testDeinitReasyncThrows() {
+    assertParse(
+      """
+      class FooClassDeinitializerA {
+        deinit 1️⃣reasync 2️⃣throws {}
+      }
+      """,
+      diagnostics: [
+        DiagnosticSpec(locationMarker: "1️⃣", message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'reasync' with 'async'"]),
+        DiagnosticSpec(locationMarker: "2️⃣", message: "deinitializers cannot throw", fixIts: ["remove 'throws'"])
+      ],
+      fixedSource: """
+        class FooClassDeinitializerA {
+          deinit async {}
+        }
+        """
+    )
+  }
+
   func testDeinitNameAwait() {
     assertParse(
       """
@@ -745,7 +764,6 @@ final class InitDeinitTests: XCTestCase {
   }
 
   func testDeinitNameParamsAwaitThrows() {
-    // TODO: Fix this
     assertParse(
       """
       class FooClassDeinitializerA {