experimental: testMate.cmd.get-debug-exec

matepek · Mar 22, 2023 · 7fe7bf3 · 7fe7bf3
1 parent 3a6584c
commit 7fe7bf3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [4.3.12]
+
 ## [4.3.11] - 2023-03-22
 
 ## [4.3.10] - 2022-12-26

diff --git a/src/WorkspaceManager.ts b/src/WorkspaceManager.ts
@@ -384,7 +384,7 @@ export class WorkspaceManager implements vscode.Disposable {
     test: AbstractTest,
     cancellation: vscode.CancellationToken,
     run: vscode.TestRun,
-    setDebugArgs: (args: string[]) => void,
+    setDebugArgs: (exec: string, args: string[]) => void,
   ): Promise<void> {
     run.enqueued(test.item);
 
@@ -398,7 +398,7 @@ export class WorkspaceManager implements vscode.Disposable {
     test: AbstractTest,
     cancellation: vscode.CancellationToken,
     run: vscode.TestRun,
-    setDebugArgs: (args: string[]) => void,
+    setDebugArgs: (exec: string, args: string[]) => void,
   ): Promise<void> {
     try {
       this._shared.log.info('Using debug');
@@ -411,7 +411,7 @@ export class WorkspaceManager implements vscode.Disposable {
       const configuration = this._getConfiguration(this._shared.log);
 
       const argsArray = executable.getDebugParams([test], configuration.getDebugBreakOnFailure());
-      setDebugArgs(argsArray);
+      setDebugArgs(executable.shared.path, argsArray);
 
       const argsArrayFunc = async (): Promise<string[]> => argsArray;
 

diff --git a/src/main.ts b/src/main.ts
@@ -166,7 +166,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
   );
 
   // https://github.com/matepek/vscode-catch2-test-adapter/issues/375
+  let currentDebugExec = '';
   let currentDebugArgs: string[] = [];
+  const setCurrentDebugVars = (exec: string, args: string[]) => {
+    currentDebugExec = exec;
+    currentDebugArgs = args;
+  };
 
   const debugProfile = controller.createRunProfile(
     'Debug Test',
@@ -209,7 +214,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
           const test = testsToRun.direct[0];
           runQueue.push(
             manager
-              .debug(test, cancellation, testRun, (args: string[]) => (currentDebugArgs = args))
+              .debug(test, cancellation, testRun, setCurrentDebugVars)
               .catch(e => {
                 vscode.window.showErrorMessage('Unexpected error from debug: ' + e);
               })
@@ -251,6 +256,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     vscode.commands.registerCommand('testMate.cmd.reload-workspaces', commandReloadWorkspaces),
   );
 
+  context.subscriptions.push(vscode.commands.registerCommand('testMate.cmd.get-debug-exec', () => currentDebugExec));
+
   context.subscriptions.push(
     vscode.commands.registerCommand('testMate.cmd.get-debug-args', () =>
       currentDebugArgs.map(a => a.replaceAll('"', '\\"')).join('" "'),