Make SourceKitDTests build in Swift 6 mode

Author: ahoppen

Tests/SourceKitDTests/CrashRecoveryTests.swift

@@ -279,18 +279,20 @@ final class CrashRecoveryTests: XCTestCase {
     let clangdRestartedFirstTime = self.expectation(description: "clangd restarted for the first time")
     let clangdRestartedSecondTime = self.expectation(description: "clangd restarted for the second time")
 
-    var clangdHasRestartedFirstTime = false
+    let clangdHasRestartedFirstTime = ThreadSafeBox(initialValue: false)
 
     await clangdServer.addStateChangeHandler { (oldState, newState) in
       switch newState {
       case .connectionInterrupted:
         clangdCrashed.fulfill()
       case .connected:
-        if !clangdHasRestartedFirstTime {
-          clangdRestartedFirstTime.fulfill()
-          clangdHasRestartedFirstTime = true
-        } else {
-          clangdRestartedSecondTime.fulfill()
+        clangdHasRestartedFirstTime.withLock { clangdHasRestartedFirstTime in
+          if !clangdHasRestartedFirstTime {
+            clangdRestartedFirstTime.fulfill()
+            clangdHasRestartedFirstTime = true
+          } else {
+            clangdRestartedSecondTime.fulfill()
+          }
         }
       default:
         break

Tests/SourceKitDTests/SourceKitDRegistryTests.swift

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+import CAtomics
 import LSPTestSupport
 import SourceKitD
 import TSCBasic
@@ -40,7 +41,7 @@ final class SourceKitDRegistryTests: XCTestCase {
     let registry = SourceKitDRegistry()
 
     @inline(never)
-    func scope(registry: SourceKitDRegistry) async throws -> Int {
+    func scope(registry: SourceKitDRegistry) async throws -> UInt32 {
       let a = await FakeSourceKitD.getOrCreate(try AbsolutePath(validating: "/a"), in: registry)
 
       await assertTrue(a === FakeSourceKitD.getOrCreate(try AbsolutePath(validating: "/a"), in: registry))
@@ -58,19 +59,18 @@ final class SourceKitDRegistryTests: XCTestCase {
   }
 }
 
-private var nextToken = 0
+private nonisolated(unsafe) var nextToken = AtomicUInt32(initialValue: 0)
 
 final class FakeSourceKitD: SourceKitD {
-  let token: Int
+  let token: UInt32
   var api: sourcekitd_api_functions_t { fatalError() }
   var keys: sourcekitd_api_keys { fatalError() }
   var requests: sourcekitd_api_requests { fatalError() }
   var values: sourcekitd_api_values { fatalError() }
   func addNotificationHandler(_ handler: SKDNotificationHandler) { fatalError() }
   func removeNotificationHandler(_ handler: SKDNotificationHandler) { fatalError() }
   private init() {
-    token = nextToken
-    nextToken += 1
+    token = nextToken.fetchAndIncrement()
   }
 
   static func getOrCreate(_ path: AbsolutePath, in registry: SourceKitDRegistry) async -> SourceKitD {

Tests/SourceKitDTests/SourceKitDTests.swift

@@ -32,7 +32,7 @@ final class SourceKitDTests: XCTestCase {
     let keys = sourcekitd.keys
     let path = DocumentURI.for(.swift).pseudoPath
 
-    let isExpectedNotification = { (response: SKDResponse) -> Bool in
+    let isExpectedNotification = { @Sendable (response: SKDResponse) -> Bool in
       if let notification: sourcekitd_api_uid_t = response.value?[keys.notification],
         let name: String = response.value?[keys.name]
       {
@@ -95,10 +95,10 @@ final class SourceKitDTests: XCTestCase {
   }
 }
 
-private class ClosureNotificationHandler: SKDNotificationHandler {
-  let f: (SKDResponse) -> Void
+private final class ClosureNotificationHandler: SKDNotificationHandler {
+  let f: @Sendable (SKDResponse) -> Void
 
-  init(_ f: @escaping (SKDResponse) -> Void) {
+  init(_ f: @Sendable @escaping (SKDResponse) -> Void) {
     self.f = f
   }