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

Merge pull request #1934 from ahoppen/multi-toolchain-support

Browse Source 
Support opening documents within the same workspace with sourcekitd/clangd from different toolchains
This commit is contained in:
Alex Hoppen
2025-01-25 08:52:52 -08:00
committed by GitHub
parent c67c06e7b1 98b1294ad9
commit ed098f58cb
18 changed files with 395 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View File

@@ -75,32 +75,10 @@ extension BuildDestinationIdentifier {
extension BuildTargetIdentifier {
fileprivate init(_ buildTarget: any SwiftBuildTarget) throws {
try self.init(target: buildTarget.name, destination: BuildDestinationIdentifier(buildTarget.destination))
}
fileprivate static let forPackageManifest = BuildTargetIdentifier(uri: try! URI(string: "swiftpm://package-manifest"))
fileprivate var targetProperties: (target: String, runDestination: String) {
get throws {
struct InvalidTargetIdentifierError: Swift.Error, CustomStringConvertible {
var target: BuildTargetIdentifier
var description: String {
return "Invalid target identifier \(target)"
}
}
guard let components = URLComponents(url: self.uri.arbitrarySchemeURL, resolvingAgainstBaseURL: false) else {
throw InvalidTargetIdentifierError(target: self)
}
let target = components.queryItems?.last(where: { $0.name == "target" })?.value
let runDestination = components.queryItems?.last(where: { $0.name == "destination" })?.value
guard let target, let runDestination else {
throw InvalidTargetIdentifierError(target: self)
}
return (target, runDestination)
}
self = try Self.createSwiftPM(
target: buildTarget.name,
destination: BuildDestinationIdentifier(buildTarget.destination)
)
}
}
@@ -604,7 +582,7 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
"--package-path", try projectRoot.filePath,
"--scratch-path", self.swiftPMWorkspace.location.scratchDirectory.pathString,
"--disable-index-store",
"--target", try target.targetProperties.target,
"--target", try target.swiftpmTargetProperties.target,
]
if options.swiftPMOrDefault.disableSandbox ?? false {
arguments += ["--disable-sandbox"]