feat: add watch mode run profile

vitest-dev · May 16, 2022 · 4ce6163 · 4ce6163
1 parent d592b6e
commit 4ce6163
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -128,6 +128,7 @@ function registerWatchHandler(
 
     statusBarItem.toDefaultMode();
   });
+
   context.subscriptions.push(
     testWatcher,
     statusBarItem,
@@ -145,6 +146,28 @@ function registerWatchHandler(
     ),
   );
 
+  ctrl.createRunProfile(
+    "Run Tests (Watch Mode)",
+    vscode.TestRunProfileKind.Run,
+    runHandler,
+    false,
+  );
+
+  async function runHandler(
+    request: vscode.TestRunRequest,
+    cancellation: vscode.CancellationToken,
+  ) {
+    if (
+      vscode.workspace.workspaceFolders === undefined ||
+      vscode.workspace.workspaceFolders.length === 0
+    ) {
+      return;
+    }
+
+    await testWatcher.watch();
+    testWatcher.runTests(request.include);
+  }
+
   return testWatcher;
 }
 

diff --git a/src/watch.ts b/src/watch.ts
@@ -62,6 +62,10 @@ export class TestWatcher extends Disposable {
   }
 
   public watch() {
+    if (this.isWatching.value) {
+      return;
+    }
+
     this.isRunning.value = true;
     this.isWatching.value = true;
     const logs = [] as string[];
@@ -142,14 +146,13 @@ export class TestWatcher extends Disposable {
       });
     }
 
-    this.vitestState.loadingPromise.then(() => {
-      this.updateStatus();
-      this.isRunning.value = false;
-    });
-
     effect(() => {
       this.onFileUpdated(this.vitestState!.files.value);
     });
+    return this.vitestState.loadingPromise.then(() => {
+      this.updateStatus();
+      this.isRunning.value = false;
+    });
   }
 
   updateStatus() {
@@ -259,7 +262,6 @@ export class TestWatcher extends Disposable {
       return;
     }
 
-    let shouldReloadFileContent = true;
     if (!this.run) {
       this.run = this.ctrl.createTestRun(new TestRunRequest());
     }
@@ -268,7 +270,6 @@ export class TestWatcher extends Disposable {
       const data = this.discover.discoverTestFromPath(
         this.ctrl,
         file.filepath,
-        shouldReloadFileContent,
       );
 
       this.syncTestStatusToVsCode(data, file, finished);