Merge pull request #1536 from ahoppen/fix-merge-race

Fix a compilation issue caused by #1533 and #1524 racing
swiftlang · Jun 28, 2024 · e5d93e1 · e5d93e1
2 parents 16e4f83 + c6b82a7
commit e5d93e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift b/Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift
@@ -221,10 +221,10 @@ public actor SwiftPMBuildSystem {
     let hostSwiftPMToolchain = try UserToolchain(swiftSDK: hostSDK)
 
     var destinationSDK: SwiftSDK
-    if let swiftSDK = options.swiftSDK {
+    if let swiftSDK = options.swiftPM.swiftSDK {
       let bundleStore = try SwiftSDKBundleStore(
         swiftSDKsDirectory: fileSystem.getSharedSwiftSDKsDirectory(
-          explicitDirectory: options.swiftSDKsDirectory.map { try AbsolutePath(validating: $0) }
+          explicitDirectory: options.swiftPM.swiftSDKsDirectory.map { try AbsolutePath(validating: $0) }
         ),
         fileSystem: fileSystem,
         observabilityScope: observabilitySystem.topScope,
@@ -235,7 +235,7 @@ public actor SwiftPMBuildSystem {
       destinationSDK = hostSDK
     }
 
-    if let triple = options.triple {
+    if let triple = options.swiftPM.triple {
       destinationSDK = hostSDK
       destinationSDK.targetTriple = try Triple(triple)
     }

diff --git a/Sources/SKTestSupport/TestSourceKitLSPClient.swift b/Sources/SKTestSupport/TestSourceKitLSPClient.swift
@@ -24,7 +24,11 @@ import XCTest
 
 extension SourceKitLSPOptions {
   public static func testDefault(experimentalFeatures: Set<ExperimentalFeature>? = nil) -> SourceKitLSPOptions {
-    return SourceKitLSPOptions(experimentalFeatures: experimentalFeatures, swiftPublishDiagnosticsDebounceDuration: 0)
+    return SourceKitLSPOptions(
+      experimentalFeatures: experimentalFeatures,
+      swiftPublishDiagnosticsDebounceDuration: 0,
+      workDoneProgressDebounceDuration: 0
+    )
   }
 }