Fix debug config handling

(Fixes issue #22)
fredericbonnet · Nov 4, 2020 · 35bd16f · 35bd16f
1 parent 1a786ff
commit 35bd16f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 28 deletions.
diff --git a/src/cmake-adapter.ts b/src/cmake-adapter.ts
@@ -60,9 +60,6 @@ export class CmakeAdapter implements TestAdapter {
   /** Currently running tests */
   private runningTests: Set<Promise<void>> = new Set();
 
-  /** Currently debugged test config */
-  private debuggedTestConfig?: Partial<vscode.DebugConfiguration>;
-
   //
   // TestAdapter implementations
   //
@@ -93,28 +90,10 @@ export class CmakeAdapter implements TestAdapter {
 
   constructor(
     public readonly workspaceFolder: vscode.WorkspaceFolder,
-    private readonly log: Log,
-    context: vscode.ExtensionContext
+    private readonly log: Log
   ) {
     this.log.info('Initializing CMake test adapter');
 
-    // Register a DebugConfigurationProvider to combine global and
-    // test-specific debug configurations (see debugTest)
-    context.subscriptions.push(
-      vscode.debug.registerDebugConfigurationProvider('cppdbg', {
-        resolveDebugConfiguration: (
-          folder: vscode.WorkspaceFolder | undefined,
-          config: vscode.DebugConfiguration,
-          token?: vscode.CancellationToken
-        ): vscode.ProviderResult<vscode.DebugConfiguration> => {
-          return {
-            ...config,
-            ...this.debuggedTestConfig,
-          };
-        },
-      })
-    );
-
     this.disposables.push(this.testsEmitter);
     this.disposables.push(this.testStatesEmitter);
     this.disposables.push(this.autorunEmitter);
@@ -429,14 +408,31 @@ export class CmakeAdapter implements TestAdapter {
 
     // Debug test
     this.log.info(`Debugging CMake test ${id}`);
+    const disposables: vscode.Disposable[] = [];
     try {
-      // Get test config
+      // Get global debug config
       const [debugConfig] = await this.getConfigStrings(['debugConfig']);
       const defaultConfig = this.getDefaultDebugConfiguration();
 
-      // Remember test-specific config for the DebugConfigurationProvider registered
-      // in the constructor (method resolveDebugConfiguration)
-      this.debuggedTestConfig = getCmakeTestDebugConfiguration(test);
+      // Get test-specific debug config
+      const debuggedTestConfig = getCmakeTestDebugConfiguration(test);
+
+      // Register a DebugConfigurationProvider to combine global and
+      // test-specific debug configurations before the debugging session starts
+      disposables.push(
+        vscode.debug.registerDebugConfigurationProvider('*', {
+          resolveDebugConfiguration: (
+            folder: vscode.WorkspaceFolder | undefined,
+            config: vscode.DebugConfiguration,
+            token?: vscode.CancellationToken
+          ): vscode.ProviderResult<vscode.DebugConfiguration> => {
+            return {
+              ...config,
+              ...debuggedTestConfig,
+            };
+          },
+        })
+      );
 
       // Start the debugging session. The actual debug config will combine the
       // global and test-specific values
@@ -447,7 +443,7 @@ export class CmakeAdapter implements TestAdapter {
     } catch (e) {
       this.log.error(`Error debugging CMake test ${id}`, e.toString());
     } finally {
-      this.debuggedTestConfig = undefined;
+      disposables.forEach((disposable) => disposable.dispose());
     }
   }
 

diff --git a/src/main.ts b/src/main.ts
@@ -57,7 +57,7 @@ export async function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(
       new TestAdapterRegistrar(
         testHub,
-        (workspaceFolder) => new CmakeAdapter(workspaceFolder, log, context),
+        (workspaceFolder) => new CmakeAdapter(workspaceFolder, log),
         log
       )
     );