refactor: allow debugExclude as a folder option

vitest-dev · Apr 6, 2024 · 9a62827 · 9a62827
1 parent 548eb8d
commit 9a62827
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 20 deletions.
diff --git a/src/debug/debugManager.ts b/src/debug/debugManager.ts
@@ -2,10 +2,12 @@ import * as vscode from 'vscode'
 import getPort from 'get-port'
 import { getConfig } from '../config'
 import { log } from '../log'
+import type { VitestFolderAPI } from '../api'
 
 export class TestDebugManager extends vscode.Disposable {
   private disposables: vscode.Disposable[] = []
   private sessions = new Set<vscode.DebugSession>()
+  private port: number | undefined
 
   private static DEBUG_DEFAULT_PORT = 9229
 
@@ -28,16 +30,29 @@ export class TestDebugManager extends vscode.Disposable {
     )
   }
 
-  public async start(defaultPort?: number) {
+  public async enable(api: VitestFolderAPI) {
+    await this.stop()
+
     const config = getConfig()
-    // TODO: test only DEBUG_DEFAULT_PORT for now
-    const port = defaultPort || config.debuggerPort || TestDebugManager.DEBUG_DEFAULT_PORT || await getPort({ port: TestDebugManager.DEBUG_DEFAULT_PORT })
+    // TODO: remove "|| TestDebugManager.DEBUG_DEFAULT_PORT"
+    this.port ??= config.debuggerPort || TestDebugManager.DEBUG_DEFAULT_PORT || await getPort({ port: TestDebugManager.DEBUG_DEFAULT_PORT })
+    api.startInspect(this.port)
+  }
+
+  public async disable(api: VitestFolderAPI) {
+    await this.stop()
+    this.port = undefined
+    api.stopInspect()
+  }
+
+  public start(folder: vscode.WorkspaceFolder) {
+    const config = getConfig(folder)
 
     const debugConfig = {
       type: 'pwa-node',
       request: 'attach',
       name: 'Debug Tests',
-      port,
+      port: this.port,
       autoAttachChildProcesses: true,
       skipFiles: config.debugExclude,
       smartStep: true,
@@ -48,17 +63,22 @@ export class TestDebugManager extends vscode.Disposable {
       },
     }
 
-    vscode.debug.startDebugging(undefined, debugConfig, {
-      suppressDebugView: true,
-    }).then((fulfilled) => {
-      if (fulfilled)
-        log.info('[DEBUG] Debugging started')
-      else
-        log.error('[DEBUG] Debugging failed')
-    }, (err) => {
-      log.error('[DEBUG] Start debugging failed')
-      log.error(err.toString())
-    })
+    vscode.debug.startDebugging(
+      folder,
+      debugConfig,
+      { suppressDebugView: true },
+    ).then(
+      (fulfilled) => {
+        if (fulfilled)
+          log.info('[DEBUG] Debugging started')
+        else
+          log.error('[DEBUG] Debugging failed')
+      },
+      (err) => {
+        log.error('[DEBUG] Start debugging failed')
+        log.error(err.toString())
+      },
+    )
   }
 
   public async stop() {

diff --git a/src/runner/runner.ts b/src/runner/runner.ts
@@ -117,13 +117,11 @@ export class TestRunner extends vscode.Disposable {
   }
 
   public async debugTests(request: vscode.TestRunRequest, token: vscode.CancellationToken) {
-    await this.debug.stop()
-
-    this.api.startInspect(9229)
+    await this.debug.enable(this.api)
 
     await this.runTests(request, token)
 
-    this.api.stopInspect()
+    await this.debug.disable(this.api)
   }
 
   private endRequestRuns(request: vscode.TestRunRequest) {
@@ -288,7 +286,7 @@ export class TestRunner extends vscode.Disposable {
 
     if (request.profile?.kind === vscode.TestRunProfileKind.Debug) {
       await this.debug.stop()
-      await this.debug.start()
+      this.debug.start(this.api.workspaceFolder)
     }
 
     const run = this.controller.createTestRun(request)