Merge branch 'main' into restart_lsp_for_config_changes

Author: rbenegal

CHANGELOG.md

@@ -8,7 +8,8 @@
 - New `swift.outputChannelLogLevel` setting to control the verbosity of the `Swift` output channel ([#1746](https://github.com/swiftlang/vscode-swift/pull/1746))
 - New `swift.debugTestsMultipleTimes` and `swift.debugTestsUntilFailure` commands for debugging tests over multiple runs ([#1763](https://github.com/swiftlang/vscode-swift/pull/1763))
 - Optionally include LLDB DAP logs in the Swift diagnostics bundle ([#1768](https://github.com/swiftlang/vscode-swift/pull/1758))
-- Show prompt to restart `SourceKit-LSP` after changing `.sourcekit-lsp/config.json` files ([#1744](https://github.com/swiftlang/vscode-swift/issues/1744))
+- Prompt to restart `SourceKit-LSP` after changing `.sourcekit-lsp/config.json` files ([#1744](https://github.com/swiftlang/vscode-swift/issues/1744))
+- Prompt to cancel and replace the active test run if one is in flight ([#1774](https://github.com/swiftlang/vscode-swift/pull/1774))
 
 ### Changed
 - Added log levels and improved Swift extension logging so a logfile is produced in addition to logging messages to the existing `Swift` output channel. Deprecated the `swift.diagnostics` setting in favour of the new `swift.outputChannelLogLevel` setting ([#1746](https://github.com/swiftlang/vscode-swift/pull/1746))

package-lock.json

@@ -1977,14 +1977,14 @@
     "@types/micromatch": "^4.0.9",
     "@types/mocha": "^10.0.10",
     "@types/mock-fs": "^4.13.4",
-    "@types/node": "^20.19.9",
+    "@types/node": "^20.19.10",
     "@types/plist": "^3.0.5",
     "@types/semver": "^7.7.0",
     "@types/sinon": "^17.0.4",
     "@types/sinon-chai": "^3.2.12",
     "@types/vscode": "^1.88.0",
     "@types/xml2js": "^0.4.14",
-    "@typescript-eslint/eslint-plugin": "^8.39.0",
+    "@typescript-eslint/eslint-plugin": "^8.39.1",
     "@typescript-eslint/parser": "^8.32.1",
     "@vscode/debugprotocol": "^1.68.0",
     "@vscode/test-cli": "^0.0.11",
@@ -2000,7 +2000,7 @@
     "eslint-config-prettier": "^10.1.8",
     "fantasticon": "^3.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.1.4",
+    "lint-staged": "^16.1.5",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
     "micromatch": "^4.0.8",
@@ -2030,6 +2030,6 @@
     "plist": "^3.1.0",
     "vscode-languageclient": "^9.0.1",
     "xml2js": "^0.6.2",
-    "zod": "^4.0.14"
+    "zod": "^4.0.17"
   }
 }

package.json

@@ -18,19 +18,22 @@ import { LinuxMain } from "./LinuxMain";
 import { PackageWatcher } from "./PackageWatcher";
 import { SwiftPackage, Target, TargetType } from "./SwiftPackage";
 import { TestExplorer } from "./TestExplorer/TestExplorer";
+import { TestRunManager } from "./TestExplorer/TestRunManager";
 import { WorkspaceContext, FolderOperation } from "./WorkspaceContext";
 import { BackgroundCompilation } from "./BackgroundCompilation";
 import { TaskQueue } from "./tasks/TaskQueue";
 import { isPathInsidePath } from "./utilities/filesystem";
 import { SwiftToolchain } from "./toolchain/toolchain";
 import { SwiftLogger } from "./logging/SwiftLogger";
+import { TestRunProxy } from "./TestExplorer/TestRunner";
 
 export class FolderContext implements vscode.Disposable {
-    private packageWatcher: PackageWatcher;
     public backgroundCompilation: BackgroundCompilation;
     public hasResolveErrors = false;
     public testExplorer?: TestExplorer;
     public taskQueue: TaskQueue;
+    private packageWatcher: PackageWatcher;
+    private testRunManager: TestRunManager;
 
     /**
      * FolderContext constructor
@@ -49,6 +52,7 @@ export class FolderContext implements vscode.Disposable {
         this.packageWatcher = new PackageWatcher(this, workspaceContext);
         this.backgroundCompilation = new BackgroundCompilation(this);
         this.taskQueue = new TaskQueue(this);
+        this.testRunManager = new TestRunManager();
     }
 
     /** dispose of any thing FolderContext holds */
@@ -212,6 +216,34 @@ export class FolderContext implements vscode.Disposable {
         return target;
     }
 
+    /**
+     * Register a new test run
+     * @param testRun The test run to register
+     * @param folder The folder context
+     * @param testKind The kind of test run
+     * @param tokenSource The cancellation token source
+     */
+    public registerTestRun(testRun: TestRunProxy, tokenSource: vscode.CancellationTokenSource) {
+        this.testRunManager.registerTestRun(testRun, this, tokenSource);
+    }
+
+    /**
+     * Returns true if there is an active test run for the given test kind
+     * @param testKind The kind of test
+     * @returns True if there is an active test run, false otherwise
+     */
+    hasActiveTestRun() {
+        return this.testRunManager.getActiveTestRun(this) !== undefined;
+    }
+
+    /**
+     * Cancels the active test run for the given test kind
+     * @param testKind The kind of test run
+     */
+    cancelTestRun() {
+        this.testRunManager.cancelTestRun(this);
+    }
+
     /**
      * Called whenever we have new document symbols
      */

src/FolderContext.ts

@@ -0,0 +1,80 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the VS Code Swift open source project
+//
+// Copyright (c) 2021-2025 the VS Code Swift project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of VS Code Swift project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import * as vscode from "vscode";
+import { TestRunProxy } from "./TestRunner";
+import { FolderContext } from "../FolderContext";
+
+/**
+ * Manages active test runs and provides functionality to check if a test run is in progress
+ * and to cancel test runs.
+ */
+export class TestRunManager {
+    private activeTestRuns = new Map<
+        string,
+        { testRun: TestRunProxy; tokenSource: vscode.CancellationTokenSource }
+    >();
+
+    /**
+     * Register a new test run
+     * @param testRun The test run to register
+     * @param folder The folder context
+     * @param tokenSource The cancellation token source
+     */
+    public registerTestRun(
+        testRun: TestRunProxy,
+        folder: FolderContext,
+        tokenSource: vscode.CancellationTokenSource
+    ) {
+        const key = this.getTestRunKey(folder);
+        this.activeTestRuns.set(key, { testRun, tokenSource });
+
+        // When the test run completes, remove it from active test runs
+        testRun.onTestRunComplete(() => {
+            this.activeTestRuns.delete(key);
+        });
+    }
+
+    /**
+     * Cancel an active test run
+     * @param folder The folder context
+     */
+    public cancelTestRun(folder: FolderContext) {
+        const key = this.getTestRunKey(folder);
+        const activeRun = this.activeTestRuns.get(key);
+        if (activeRun) {
+            activeRun.tokenSource.cancel();
+        }
+    }
+
+    /**
+     * Check if a test run is already in progress for the given folder and test kind
+     * @param folder The folder context
+     * @returns The active test run if one exists, undefined otherwise
+     */
+    public getActiveTestRun(folder: FolderContext) {
+        const key = this.getTestRunKey(folder);
+        const activeRun = this.activeTestRuns.get(key);
+        return activeRun?.testRun;
+    }
+
+    /**
+     * Generate a unique key for a test run based on folder and test kind
+     * @param folder The folder context
+     * @returns A unique key
+     */
+    private getTestRunKey(folder: FolderContext) {
+        return folder.folder.fsPath;
+    }
+}