Make SourceKitLSPTests build in Swift 6 mode

Author: ahoppen

Tests/SourceKitLSPTests/BackgroundIndexingTests.swift

@@ -202,9 +202,10 @@ final class BackgroundIndexingTests: XCTestCase {
 
     // Wait for indexing to finish without elevating the priority
     let semaphore = WrappedSemaphore()
+    let testClient = project.testClient
     Task(priority: .low) {
       await assertNoThrow {
-        try await project.testClient.send(PollIndexRequest())
+        try await testClient.send(PollIndexRequest())
       }
       semaphore.signal()
     }

Tests/SourceKitLSPTests/BuildSystemTests.swift

@@ -21,11 +21,11 @@ import XCTest
 
 /// Build system to be used for testing BuildSystem and BuildSystemDelegate functionality with SourceKitLSPServer
 /// and other components.
-final class TestBuildSystem: BuildSystem {
-  var projectRoot: AbsolutePath = try! AbsolutePath(validating: "/")
-  var indexStorePath: AbsolutePath? = nil
-  var indexDatabasePath: AbsolutePath? = nil
-  var indexPrefixMappings: [PathPrefixMapping] = []
+actor TestBuildSystem: BuildSystem {
+  let projectRoot: AbsolutePath = try! AbsolutePath(validating: "/")
+  let indexStorePath: AbsolutePath? = nil
+  let indexDatabasePath: AbsolutePath? = nil
+  let indexPrefixMappings: [PathPrefixMapping] = []
 
   weak var delegate: BuildSystemDelegate?
 
@@ -34,10 +34,14 @@ final class TestBuildSystem: BuildSystem {
   }
 
   /// Build settings by file.
-  var buildSettingsByFile: [DocumentURI: FileBuildSettings] = [:]
+  private var buildSettingsByFile: [DocumentURI: FileBuildSettings] = [:]
 
   /// Files currently being watched by our delegate.
-  var watchedFiles: Set<DocumentURI> = []
+  private var watchedFiles: Set<DocumentURI> = []
+
+  func setBuildSettings(for uri: DocumentURI, to buildSettings: FileBuildSettings) {
+    buildSettingsByFile[uri] = buildSettings
+  }
 
   func buildSettings(
     for document: DocumentURI,
@@ -160,7 +164,7 @@ final class BuildSystemTests: XCTestCase {
       }
       """
 
-    buildSystem.buildSettingsByFile[doc] = FileBuildSettings(compilerArguments: args)
+    await buildSystem.setBuildSettings(for: doc, to: FileBuildSettings(compilerArguments: args))
 
     let documentManager = await self.testClient.server._documentManager
 
@@ -173,7 +177,7 @@ final class BuildSystemTests: XCTestCase {
     // Modify the build settings and inform the delegate.
     // This should trigger a new publish diagnostics and we should no longer have errors.
     let newSettings = FileBuildSettings(compilerArguments: args + ["-DFOO"])
-    buildSystem.buildSettingsByFile[doc] = newSettings
+    await buildSystem.setBuildSettings(for: doc, to: newSettings)
 
     await buildSystem.delegate?.fileBuildSettingsChanged([doc])
 
@@ -194,7 +198,7 @@ final class BuildSystemTests: XCTestCase {
       .buildSettings(for: doc, language: .swift)!
       .compilerArguments
 
-    buildSystem.buildSettingsByFile[doc] = FileBuildSettings(compilerArguments: args)
+    await buildSystem.setBuildSettings(for: doc, to: FileBuildSettings(compilerArguments: args))
 
     let text = """
       #if FOO
@@ -214,7 +218,7 @@ final class BuildSystemTests: XCTestCase {
     // Modify the build settings and inform the delegate.
     // This should trigger a new publish diagnostics and we should no longer have errors.
     let newSettings = FileBuildSettings(compilerArguments: args + ["-DFOO"])
-    buildSystem.buildSettingsByFile[doc] = newSettings
+    await buildSystem.setBuildSettings(for: doc, to: newSettings)
 
     await buildSystem.delegate?.fileBuildSettingsChanged([doc])
 
@@ -248,7 +252,7 @@ final class BuildSystemTests: XCTestCase {
     // Modify the build settings and inform the delegate.
     // This should trigger a new publish diagnostics and we should see a diagnostic.
     let newSettings = FileBuildSettings(compilerArguments: args)
-    buildSystem.buildSettingsByFile[doc] = newSettings
+    await buildSystem.setBuildSettings(for: doc, to: newSettings)
 
     await buildSystem.delegate?.fileBuildSettingsChanged([doc])
 
@@ -283,7 +287,7 @@ final class BuildSystemTests: XCTestCase {
     XCTAssertEqual(text, try documentManager.latestSnapshot(doc).text)
 
     // Swap from fallback settings to primary build system settings.
-    buildSystem.buildSettingsByFile[doc] = primarySettings
+    await buildSystem.setBuildSettings(for: doc, to: primarySettings)
 
     await buildSystem.delegate?.fileBuildSettingsChanged([doc])
 

Tests/SourceKitLSPTests/CodeActionTests.swift

@@ -20,7 +20,7 @@ private typealias CodeActionCapabilities = TextDocumentClientCapabilities.CodeAc
 private typealias CodeActionLiteralSupport = CodeActionCapabilities.CodeActionLiteralSupport
 private typealias CodeActionKindCapabilities = CodeActionLiteralSupport.CodeActionKind
 
-private var clientCapabilitiesWithCodeActionSupport: ClientCapabilities = {
+private let clientCapabilitiesWithCodeActionSupport: ClientCapabilities = {
   var documentCapabilities = TextDocumentClientCapabilities()
   var codeActionCapabilities = CodeActionCapabilities()
   let codeActionKinds = CodeActionKindCapabilities(valueSet: [.refactor, .quickFix])

Tests/SourceKitLSPTests/LocalSwiftTests.swift

@@ -1352,7 +1352,9 @@ final class LocalSwiftTests: XCTestCase {
     let uri = DocumentURI(url)
 
     let reusedNodeCallback = self.expectation(description: "reused node callback called")
-    var reusedNodes: [Syntax] = []
+    // nonisolated(unsafe) is fine because the variable will only be read after all writes from reusedNodeCallback are
+    // done.
+    nonisolated(unsafe) var reusedNodes: [Syntax] = []
     let swiftLanguageService =
       await testClient.server._languageService(for: uri, .swift, in: testClient.server.workspaceForDocument(uri: uri)!)
       as! SwiftLanguageService