Remove workarounds that are no longer needed

Author: ahoppen

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -59,16 +59,6 @@ package typealias SwiftBuildTarget = SourceKitLSPAPI.BuildTarget
 /// A build target in `BuildServerProtocol`
 package typealias BuildServerTarget = BuildServerProtocol.BuildTarget
 
-/// Same as `toolchainRegistry.default`.
-///
-/// Needed to work around a compiler crash that prevents us from accessing `toolchainRegistry.preferredToolchain` in
-/// `SwiftPMWorkspace.init`.
-private func preferredToolchain(_ toolchainRegistry: ToolchainRegistry) async -> Toolchain? {
-  return await toolchainRegistry.preferredToolchain(containing: [
-    \.clang, \.clangd, \.sourcekitd, \.swift, \.swiftc,
-  ])
-}
-
 fileprivate extension BuildDestination {
   /// A string that can be used to identify the build triple in `ConfiguredTarget.runDestinationID`.
   ///
@@ -213,7 +203,10 @@ package actor SwiftPMBuildSystem {
     self.workspacePath = workspacePath
     self.options = options
     self.fileSystem = fileSystem
-    guard let toolchain = await preferredToolchain(toolchainRegistry) else {
+    let toolchain = await toolchainRegistry.preferredToolchain(containing: [
+      \.clang, \.clangd, \.sourcekitd, \.swift, \.swiftc,
+    ])
+    guard let toolchain else {
       throw Error.cannotDetermineHostToolchain
     }
 

Sources/SourceKitLSP/Swift/SwiftLanguageService.swift

@@ -145,7 +145,7 @@ package actor SwiftLanguageService: LanguageService, Sendable {
 
   private var stateChangeHandlers: [(_ oldState: LanguageServerState, _ newState: LanguageServerState) -> Void] = []
 
-  private var diagnosticReportManager: DiagnosticReportManager!
+  private let diagnosticReportManager: DiagnosticReportManager
 
   var documentManager: DocumentManager {
     get throws {
@@ -165,14 +165,6 @@ package actor SwiftLanguageService: LanguageService, Sendable {
   /// request.
   private let refreshDiagnosticsDebouncer: Debouncer<Void>
 
-  /// Only exists to work around rdar://116221716.
-  /// Once that is fixed, remove the property and make `diagnosticReportManager` non-optional.
-  private var clientHasDiagnosticsCodeDescriptionSupport: Bool {
-    get async {
-      return await capabilityRegistry.clientHasDiagnosticsCodeDescriptionSupport
-    }
-  }
-
   /// Creates a language server for the given client using the sourcekitd dylib specified in `toolchain`.
   /// `reopenDocuments` is a closure that will be called if sourcekitd crashes and the `SwiftLanguageService` asks its
   /// parent server to reopen all of its documents.
@@ -192,7 +184,6 @@ package actor SwiftLanguageService: LanguageService, Sendable {
     self.semanticIndexManager = workspace.semanticIndexManager
     self.testHooks = testHooks
     self.state = .connected
-    self.diagnosticReportManager = nil  // Needed to work around rdar://116221716
     self.options = options
 
     // The debounce duration of 500ms was chosen arbitrarily without scientific research.
@@ -210,8 +201,8 @@ package actor SwiftLanguageService: LanguageService, Sendable {
       sourcekitd: self.sourcekitd,
       options: options,
       syntaxTreeManager: syntaxTreeManager,
-      documentManager: try documentManager,
-      clientHasDiagnosticsCodeDescriptionSupport: await self.clientHasDiagnosticsCodeDescriptionSupport
+      documentManager: sourceKitLSPServer.documentManager,
+      clientHasDiagnosticsCodeDescriptionSupport: await capabilityRegistry.clientHasDiagnosticsCodeDescriptionSupport
     )
 
     // Create sub-directories for each type of generated file

Sources/SourceKitLSP/WorkDoneProgressManager.swift

@@ -60,11 +60,6 @@ actor WorkDoneProgressManager {
   /// The last status that was sent to the client. Used so we don't send no-op updates to the client.
   private var lastStatus: Status? = nil
 
-  /// Needed to work around rdar://116221716
-  private static func getServerCapabilityRegistry(_ server: SourceKitLSPServer) async -> CapabilityRegistry? {
-    return await server.capabilityRegistry
-  }
-
   init?(
     server: SourceKitLSPServer,
     tokenPrefix: String,
@@ -73,7 +68,7 @@ actor WorkDoneProgressManager {
     message: String? = nil,
     percentage: Int? = nil
   ) async {
-    guard let capabilityRegistry = await Self.getServerCapabilityRegistry(server) else {
+    guard let capabilityRegistry = await server.capabilityRegistry else {
       return nil
     }
     self.init(

Tests/BuildSystemIntegrationTests/BuildSystemManagerTests.swift

@@ -546,11 +546,7 @@ private actor BSMDelegate: BuildSystemDelegate {
 
   init(_ bsm: BuildSystemManager) async {
     self.bsm = bsm
-    // Actor initializers can't directly leave their executor. Moving the call
-    // of `bsm.setDelegate` into a closure works around that limitation. rdar://116221716
-    await {
-      await bsm.setDelegate(self)
-    }()
+    await bsm.setDelegate(self)
   }
 
   func fileBuildSettingsChanged(_ changedFiles: Set<DocumentURI>) async {