Support creation of `InProcessSourceKitLSPClient with a list of Xcode toolchains

Author: ahoppen

Sources/Diagnose/IndexCommand.swift

@@ -113,7 +113,7 @@ package struct IndexCommand: AsyncParsableCommand {
 
     let messageHandler = IndexLogMessageHandler()
     let inProcessClient = try await InProcessSourceKitLSPClient(
-      toolchainPath: installPath,
+      toolchainRegistry: ToolchainRegistry(installPath: installPath),
       options: options,
       workspaceFolders: [WorkspaceFolder(uri: DocumentURI(URL(fileURLWithPath: project)))],
       messageHandler: messageHandler

Sources/InProcessClient/InProcessSourceKitLSPClient.swift

@@ -16,16 +16,17 @@ public import LanguageServerProtocol
 import LanguageServerProtocolExtensions
 import SwiftExtensions
 import TSCExtensions
-import ToolchainRegistry
 
 import struct TSCBasic.AbsolutePath
 
 #if compiler(>=6)
 package import SKOptions
 package import SourceKitLSP
+package import ToolchainRegistry
 #else
 import SKOptions
 import SourceKitLSP
+import ToolchainRegistry
 #endif
 
 /// Launches a `SourceKitLSPServer` in-process and allows sending messages to it.
@@ -41,7 +42,7 @@ public final class InProcessSourceKitLSPClient: Sendable {
     messageHandler: any MessageHandler
   ) async throws {
     try await self.init(
-      toolchainPath: toolchainPath,
+      toolchainRegistry: ToolchainRegistry(installPath: toolchainPath),
       options: SourceKitLSPOptions(),
       capabilities: capabilities,
       workspaceFolders: workspaceFolders,
@@ -53,7 +54,7 @@ public final class InProcessSourceKitLSPClient: Sendable {
   ///
   /// `messageHandler` handles notifications and requests sent from the SourceKit-LSP server to the client.
   package init(
-    toolchainPath: URL?,
+    toolchainRegistry: ToolchainRegistry,
     options: SourceKitLSPOptions = SourceKitLSPOptions(),
     hooks: Hooks = Hooks(),
     capabilities: ClientCapabilities = ClientCapabilities(),
@@ -63,7 +64,7 @@ public final class InProcessSourceKitLSPClient: Sendable {
     let serverToClientConnection = LocalConnection(receiverName: "client")
     self.server = SourceKitLSPServer(
       client: serverToClientConnection,
-      toolchainRegistry: ToolchainRegistry(installPath: toolchainPath),
+      toolchainRegistry: toolchainRegistry,
       options: options,
       hooks: hooks,
       onExit: {

Sources/ToolchainRegistry/ToolchainRegistry.swift

@@ -145,6 +145,17 @@ package final actor ToolchainRegistry {
     }
   }
 
+  package init(xcodeToolchains toolchainPaths: [URL]) {
+    let toolchainsAndReasons: [(toolchain: Toolchain, reason: ToolchainRegisterReason)] = toolchainPaths.compactMap {
+      path in
+      guard let toolchain = Toolchain(path) else {
+        return nil
+      }
+      return (toolchain, .xcode)
+    }
+    self.init(toolchainsAndReasons: toolchainsAndReasons, darwinToolchainOverride: nil)
+  }
+
   /// A toolchain registry used for testing that scans for toolchains based on environment variables and Xcode
   /// installations but not next to the `sourcekit-lsp` binary because there is no `sourcekit-lsp` binary during
   /// testing.