averello/sourcekit-lsp
1
0
Fork 0
mirror of https://github.com/apple/sourcekit-lsp.git synced 2026-03-06 18:24:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove workarounds that are no longer needed

Browse Source
This commit is contained in:
Alex Hoppen
2024-08-17 07:52:55 -07:00
parent 900db4ca25
commit 189f32ae04
4 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View File

@@ -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
}