Skip to content

Commit c6b82a7

Browse files
committed
Fix a compilation issue caused by swiftlang#1533 and swiftlang#1524 racing
1 parent 16e4f83 commit c6b82a7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ public actor SwiftPMBuildSystem {
221221
let hostSwiftPMToolchain = try UserToolchain(swiftSDK: hostSDK)
222222

223223
var destinationSDK: SwiftSDK
224-
if let swiftSDK = options.swiftSDK {
224+
if let swiftSDK = options.swiftPM.swiftSDK {
225225
let bundleStore = try SwiftSDKBundleStore(
226226
swiftSDKsDirectory: fileSystem.getSharedSwiftSDKsDirectory(
227-
explicitDirectory: options.swiftSDKsDirectory.map { try AbsolutePath(validating: $0) }
227+
explicitDirectory: options.swiftPM.swiftSDKsDirectory.map { try AbsolutePath(validating: $0) }
228228
),
229229
fileSystem: fileSystem,
230230
observabilityScope: observabilitySystem.topScope,
@@ -235,7 +235,7 @@ public actor SwiftPMBuildSystem {
235235
destinationSDK = hostSDK
236236
}
237237

238-
if let triple = options.triple {
238+
if let triple = options.swiftPM.triple {
239239
destinationSDK = hostSDK
240240
destinationSDK.targetTriple = try Triple(triple)
241241
}

Sources/SKTestSupport/TestSourceKitLSPClient.swift

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ import XCTest
2424

2525
extension SourceKitLSPOptions {
2626
public static func testDefault(experimentalFeatures: Set<ExperimentalFeature>? = nil) -> SourceKitLSPOptions {
27-
return SourceKitLSPOptions(experimentalFeatures: experimentalFeatures, swiftPublishDiagnosticsDebounceDuration: 0)
27+
return SourceKitLSPOptions(
28+
experimentalFeatures: experimentalFeatures,
29+
swiftPublishDiagnosticsDebounceDuration: 0,
30+
workDoneProgressDebounceDuration: 0
31+
)
2832
}
2933
}
3034

0 commit comments

Comments
 (0)