Run tests with file watcher

client/package.json

@@ -11,7 +11,7 @@
     "url": "https://github.com/denoland/vscode_deno"
   },
   "engines": {
-    "vscode": "^1.60.0"
+    "vscode": "^1.77.0"
   },
   "dependencies": {
     "dotenv": "^16.4.5",
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/semver": "7.3.9",
-    "@types/vscode": "1.67.0",
+    "@types/vscode": "1.77.0",
     "vscode-test": "^1.6.1"
   }
 }

client/src/lsp_extensions.ts

@@ -98,6 +98,9 @@ export interface TestRunRequestParams {
   /** The run kind. Currently Deno only supports `"run"` */
   kind: "run" | "coverage" | "debug";
 
+  /** Whether the run should watch the files and continously re-run. */
+  isContinuous: boolean;
+
   /** Test modules or tests to exclude from the test run. */
   exclude?: TestIdentifier[];
 
@@ -210,6 +213,11 @@ interface TestOutput {
   location?: Location;
 }
 
+interface TestRunRestart {
+  type: "restart";
+  enqueued: EnqueuedTestModule[]
+}
+
 interface TestEnd {
   /** The test run has ended. */
   type: "end";
@@ -220,6 +228,7 @@ type TestRunProgressMessage =
   | TestFailedErrored
   | TestPassed
   | TestOutput
+  | TestRunRestart
   | TestEnd;
 
 export interface TestRunProgressParams {

client/src/testing.ts

@@ -131,9 +131,18 @@ function getTestItem(
   }
 }
 
+interface TestRunRequestInfo {
+  readonly include: readonly vscode.TestItem[] | undefined;
+  readonly exclude: readonly vscode.TestItem[] | undefined;
+  readonly profile: vscode.TestRunProfile | undefined;
+}
+
 export class DenoTestController implements vscode.Disposable {
   #runCount = 0;
-  #runs = new Map<number, vscode.TestRun>();
+  #runs = new Map<
+    number,
+    { run: vscode.TestRun; request: TestRunRequestInfo }
+  >();
   #subscriptions: vscode.Disposable[] = [];
 
   constructor(client: LanguageClient) {
@@ -148,7 +157,14 @@ export class DenoTestController implements vscode.Disposable {
     ) => {
       const run = testController.createTestRun(request);
       const id = ++this.#runCount;
-      this.#runs.set(id, run);
+      this.#runs.set(id, {
+        run,
+        request: {
+          include: request.include,
+          exclude: request.exclude,
+          profile: request.profile,
+        },
+      });
       // currently on "run" is implemented and exposed
       let kind: "run" | "coverage" | "debug" = "run";
       switch (request.profile?.kind) {
@@ -159,6 +175,7 @@ export class DenoTestController implements vscode.Disposable {
           kind = "debug";
           break;
       }
+      const isContinuous = request.continuous ?? false;
       const include = request.include
         ? request.include.map(asTestIdentifier)
         : undefined;
@@ -168,13 +185,16 @@ export class DenoTestController implements vscode.Disposable {
       const { enqueued } = await client.sendRequest(testRun, {
         id,
         kind,
+        isContinuous,
         include,
         exclude,
       });
 
       cancellation.onCancellationRequested(async () => {
         await client.sendRequest(testRunCancel, { id });
-        run.end();
+        // The run can be replaced
+        const runData = this.#runs.get(id);
+        runData?.run.end();
         this.#runs.delete(id);
       });
 
@@ -194,6 +214,8 @@ export class DenoTestController implements vscode.Disposable {
       vscode.TestRunProfileKind.Run,
       runHandler,
       true,
+      undefined,
+      true,
     );
     // TODO(@kitsonk) add debug run profile
     // TODO(@kitsonk) add coverage run profile
@@ -277,10 +299,11 @@ export class DenoTestController implements vscode.Disposable {
     );
 
     client.onNotification(testRunProgress, ({ id, message }) => {
-      const run = this.#runs.get(id);
-      if (!run) {
+      const runData = this.#runs.get(id);
+      if (!runData) {
         return;
       }
+      const { run } = runData;
       switch (message.type) {
         case "enqueued":
         case "started":
@@ -317,6 +340,29 @@ export class DenoTestController implements vscode.Disposable {
           run.appendOutput(value, loc, item);
           break;
         }
+        case "restart": {
+          const { enqueued } = message;
+          run.end();
+          const newRun = testController.createTestRun(
+            new vscode.TestRunRequest(
+              runData.request.include,
+              runData.request.exclude,
+              runData.request.profile,
+              true,
+            ),
+          );
+          for (const { textDocument, ids } of enqueued) {
+            for (const id of ids) {
+              const item = getTestItem(testController, { textDocument, id });
+              if (!item) {
+                continue;
+              }
+              newRun.enqueued(item);
+            }
+          }
+          this.#runs.set(id, { run: newRun, request: runData.request });
+          break;
+        }
         case "end": {
           run.end();
           this.#runs.delete(id);

package.json

@@ -29,7 +29,7 @@
     "deno"
   ],
   "engines": {
-    "vscode": "^1.60.0"
+    "vscode": "^1.77.0"
   },
   "activationEvents": [
     "onLanguage:typescript",
@@ -257,7 +257,9 @@
           "markdownDescription": "Additional environment variables to pass to Deno processes. Overrides the user's env and `deno.envFile`. These will be overridden by more specific settings such as `deno.future` for `DENO_FUTURE`, and invariables like `NO_COLOR=1`.",
           "scope": "window",
           "examples": [
-            { "HTTP_PROXY": "http://localhost:8080" }
+            {
+              "HTTP_PROXY": "http://localhost:8080"
+            }
           ]
         },
         "deno.envFile": {
@@ -479,7 +481,11 @@
           "scope": "resource"
         },
         "deno.trace.server": {
-          "enum": ["messages", "off", "verbose"],
+          "enum": [
+            "messages",
+            "off",
+            "verbose"
+          ],
           "default": "off",
           "markdownDescription": "Traces the communication between VS Code and the Deno Language Server.",
           "scope": "window"

typescript-deno-plugin/package.json

@@ -16,7 +16,7 @@
     "url": "https://github.com/denoland/vscode_deno"
   },
   "engines": {
-    "vscode": "^1.60.0"
+    "vscode": "^1.77.0"
   },
   "devDependencies": {
     "typescript": "^5.0.2"