Skip to content

Commit dddc983

Browse files
committed
Make BuildServerManager.toolchain only take a target, no document
The document wasn’t used in here.
1 parent 6301397 commit dddc983

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

Sources/BuildServerIntegration/BuildServerManager.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -757,16 +757,12 @@ package actor BuildServerManager: QueueBasedMessageHandler {
757757

758758
// MARK: Build server queries
759759

760-
/// Returns the toolchain that should be used to process the given document.
760+
/// Returns the toolchain that should be used to process the given target.
761761
package func toolchain(
762-
for uri: DocumentURI,
763-
in target: BuildTargetIdentifier?,
762+
for target: BuildTargetIdentifier,
764763
language: Language
765764
) async -> Toolchain? {
766765
let toolchainPath = await orLog("Getting toolchain from build targets") { () -> URL? in
767-
guard let target else {
768-
return nil
769-
}
770766
let targets = try await self.buildTargets()
771767
guard let target = targets[target]?.target else {
772768
logger.error("Failed to find target \(target.forLogging) to determine toolchain")

Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ package struct UpdateIndexStoreTaskDescription: IndexTaskDescription {
280280
logger.error("Not indexing \(file.forLogging) because it has fallback compiler arguments")
281281
return
282282
}
283-
guard let toolchain = await buildServerManager.toolchain(for: file.mainFile, in: target, language: language) else {
283+
guard let toolchain = await buildServerManager.toolchain(for: target, language: language) else {
284284
logger.error(
285285
"Not updating index store for \(file.forLogging) because no toolchain could be determined for the document"
286286
)

Sources/SourceKitLSP/SourceKitLSPServer.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -567,11 +567,12 @@ package actor SourceKitLSPServer {
567567
return existingLanguageServices
568568
}
569569

570-
let toolchain = await workspace.buildServerManager.toolchain(
571-
for: uri,
572-
in: workspace.buildServerManager.canonicalTarget(for: uri),
573-
language: language
574-
)
570+
let toolchain: Toolchain? =
571+
if let target = await workspace.buildServerManager.canonicalTarget(for: uri) {
572+
await workspace.buildServerManager.toolchain(for: target, language: language)
573+
} else {
574+
nil
575+
}
575576
guard let toolchain else {
576577
logger.error("Failed to determine toolchain for \(uri)")
577578
return []

0 commit comments

Comments
 (0)