Merge pull request #2162 from bnbarham/20250519-manual-merge

Merge main into release/6.2

Author: bnbarham

Package.swift

@@ -229,7 +229,7 @@ var targets: [Target] = [
       .product(name: "SwiftDocC", package: "swift-docc"),
       .product(name: "SymbolKit", package: "swift-docc-symbolkit"),
     ],
-    exclude: ["CMakeLists.txt"],
+    exclude: [],
     swiftSettings: globalSwiftSettings
   ),
 
@@ -807,7 +807,7 @@ var dependencies: [Package.Dependency] {
       .package(url: "https://github.com/swiftlang/swift-docc.git", branch: relatedDependenciesBranch),
       .package(url: "https://github.com/swiftlang/swift-docc-symbolkit.git", branch: relatedDependenciesBranch),
       .package(url: "https://github.com/swiftlang/swift-markdown.git", branch: relatedDependenciesBranch),
-      .package(url: "https://github.com/apple/swift-tools-support-core.git", branch: relatedDependenciesBranch),
+      .package(url: "https://github.com/swiftlang/swift-tools-support-core.git", branch: relatedDependenciesBranch),
       .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
       .package(url: "https://github.com/swiftlang/swift-syntax.git", branch: relatedDependenciesBranch),
       .package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"),

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -203,19 +203,25 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
       throw Error.cannotDetermineHostToolchain
     }
 
+    var absProjectRoot = try AbsolutePath(validating: projectRoot.filePath)
     let hostSDK = try SwiftSDK.hostSwiftSDK(AbsolutePath(validating: destinationToolchainBinDir.filePath))
     let hostSwiftPMToolchain = try UserToolchain(swiftSDK: hostSDK)
 
     let destinationSDK = try SwiftSDK.deriveTargetSwiftSDK(
       hostSwiftSDK: hostSDK,
       hostTriple: hostSwiftPMToolchain.targetTriple,
-      customToolsets: options.swiftPMOrDefault.toolsets?.map { try AbsolutePath(validating: $0) } ?? [],
+      customToolsets: options.swiftPMOrDefault.toolsets?.map {
+        try AbsolutePath(validating: $0, relativeTo: absProjectRoot)
+      } ?? [],
       customCompileTriple: options.swiftPMOrDefault.triple.map { try Triple($0) },
       swiftSDKSelector: options.swiftPMOrDefault.swiftSDK,
       store: SwiftSDKBundleStore(
         swiftSDKsDirectory: localFileSystem.getSharedSwiftSDKsDirectory(
-          explicitDirectory: options.swiftPMOrDefault.swiftSDKsDirectory.map { try AbsolutePath(validating: $0) }
+          explicitDirectory: options.swiftPMOrDefault.swiftSDKsDirectory.map {
+            try AbsolutePath(validating: $0, relativeTo: absProjectRoot)
+          }
         ),
+        hostToolchainBinDir: hostSwiftPMToolchain.swiftCompilerPath.parentDirectory,
         fileSystem: localFileSystem,
         observabilityScope: observabilitySystem.topScope.makeChildScope(description: "SwiftPM Bundle Store"),
         outputHandler: { _ in }
@@ -227,20 +233,14 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
     let destinationSwiftPMToolchain = try UserToolchain(swiftSDK: destinationSDK)
 
     var location = try Workspace.Location(
-      forRootPackage: try AbsolutePath(validating: projectRoot.filePath),
+      forRootPackage: absProjectRoot,
       fileSystem: localFileSystem
     )
+
     if options.backgroundIndexingOrDefault {
-      location.scratchDirectory = try AbsolutePath(
-        validating: projectRoot.appendingPathComponent(".build").appendingPathComponent("index-build").filePath
-      )
-    } else if let scratchDirectory = options.swiftPMOrDefault.scratchPath,
-      let scratchDirectoryPath = try? AbsolutePath(
-        validating: scratchDirectory,
-        relativeTo: AbsolutePath(validating: projectRoot.filePath)
-      )
-    {
-      location.scratchDirectory = scratchDirectoryPath
+      location.scratchDirectory = absProjectRoot.appending(components: ".build", "index-build")
+    } else if let scratchDirectory = options.swiftPMOrDefault.scratchPath {
+      location.scratchDirectory = try AbsolutePath(validating: scratchDirectory, relativeTo: absProjectRoot)
     }
 
     var configuration = WorkspaceConfiguration.default

Sources/SemanticIndex/PreparationTaskDescription.swift

@@ -105,9 +105,7 @@ package struct PreparationTaskDescription: IndexTaskDescription {
       do {
         try await buildSystemManager.prepare(targets: Set(targetsToPrepare))
       } catch {
-        logger.error(
-          "Preparation failed: \(error.forLogging)"
-        )
+        logger.error("Preparation failed: \(error.forLogging)")
       }
       await hooks.preparationTaskDidFinish?(self)
       if !Task.isCancelled {

Sources/SemanticIndex/TaskScheduler.swift

@@ -249,6 +249,14 @@ package actor QueuedTask<TaskDescription: TaskDescriptionProtocol> {
     _isExecuting.value = true
     executionTask = task
     executionTaskCreatedContinuation.yield(task)
+    if self.resultTaskCancelled.value {
+      // The queued task might have been cancelled after the execution ask was started but before the task was yielded
+      // to `executionTaskCreatedContinuation`. In that case the result task will simply cancel the await on the
+      // `executionTaskCreatedStream` and hence not call `valuePropagatingCancellation` on the execution task. This
+      // means that the queued task cancellation wouldn't be propagated to the execution task. To address this, check if
+      // `resultTaskCancelled` was  set and, if so, explicitly cancel the execution task here.
+      task.cancel()
+    }
     await executionStateChangedCallback?(self, .executing)
     return await task.value
   }
@@ -513,6 +521,9 @@ package actor TaskScheduler<TaskDescription: TaskDescriptionProtocol> {
   ///
   /// This will continue calling itself until the queue is empty.
   private func poke() {
+    if isShutDown {
+      return
+    }
     pendingTasks.sort(by: { $0.priority > $1.priority })
     for task in pendingTasks {
       guard

Sources/SourceKitLSP/Swift/MacroExpansion.swift

@@ -94,6 +94,7 @@ actor MacroExpansionManager {
     let length = snapshot.utf8OffsetRange(of: range).count
 
     let skreq = swiftLanguageService.sourcekitd.dictionary([
+      keys.cancelOnSubsequentRequest: 0,
       keys.request: swiftLanguageService.requests.semanticRefactoring,
       // Preferred name for e.g. an extracted variable.
       // Empty string means sourcekitd chooses a name automatically.

Sources/SourceKitLSP/Swift/RefactoringResponse.swift

@@ -117,6 +117,7 @@ extension SwiftLanguageService {
     let utf8Column = snapshot.lineTable.utf8ColumnAt(line: line, utf16Column: utf16Column)
 
     let skreq = sourcekitd.dictionary([
+      keys.cancelOnSubsequentRequest: 0,
       keys.request: self.requests.semanticRefactoring,
       // Preferred name for e.g. an extracted variable.
       // Empty string means sourcekitd chooses a name automatically.

Sources/SourceKitLSP/Swift/VariableTypeInfo.swift

@@ -86,6 +86,7 @@ extension SwiftLanguageService {
     let snapshot = try await self.latestSnapshot(for: uri)
 
     let skreq = sourcekitd.dictionary([
+      keys.cancelOnSubsequentRequest: 0,
       keys.request: requests.collectVariableType,
       keys.sourceFile: snapshot.uri.sourcekitdSourceFile,
       keys.primaryFile: snapshot.uri.primaryFile?.pseudoPath,

Sources/sourcekit-lsp/SourceKitLSP.swift

@@ -237,6 +237,8 @@ struct SourceKitLSP: AsyncParsableCommand {
       fatalError("failed to redirect stdout -> stderr: \(strerror(errno)!)")
     }
 
+    logger.log("sourcekit-lsp launched from \(ProcessInfo.processInfo.arguments.first ?? "<nil>")")
+
     let globalConfigurationOptions = globalConfigurationOptions
     if let logLevelStr = globalConfigurationOptions.loggingOrDefault.level,
       let logLevel = NonDarwinLogLevel(logLevelStr)