Fixed issue with build-debug not working in quick succession

Author: rijesha

src/extension.ts

@@ -55,6 +55,7 @@ import {
   runDtshShell,
   clean,
   MenuConfig,
+  build,
 } from "./zephyr_utilities/build";
 import { flashActive } from "./zephyr_utilities/flash";
 import { WorkspaceConfig, GlobalConfig } from "./setup_utilities/types";
@@ -983,7 +984,7 @@ export async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     vscode.commands.registerCommand("zephyr-ide.debug", async () => {
       let debugTarget = "Zephyr IDE: Debug";
-      let activeBuild = await project.getActiveBuild(context, wsConfig);
+      let activeBuild = await project.getActiveBuild(wsConfig);
 
       if (activeBuild?.launchTarget) {
         debugTarget = activeBuild.launchTarget;
@@ -1008,7 +1009,7 @@ export async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     vscode.commands.registerCommand("zephyr-ide.debug-attach", async () => {
       let debugTarget = "Zephyr IDE: Attach";
-      let activeBuild = await project.getActiveBuild(context, wsConfig);
+      let activeBuild = await project.getActiveBuild(wsConfig);
 
       if (activeBuild?.attachTarget) {
         debugTarget = activeBuild.attachTarget;
@@ -1033,18 +1034,40 @@ export async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     vscode.commands.registerCommand("zephyr-ide.build-debug", async () => {
       let debugTarget = "Zephyr IDE: Debug";
-      let activeBuild = await project.getActiveBuild(context, wsConfig);
+      let activeProject = await project.getActiveProject(wsConfig);
+      let activeBuild = await project.getActiveBuild(wsConfig);
 
-      if (activeBuild?.buildDebugTarget) {
+      if (activeProject && activeBuild?.buildDebugTarget) {
         debugTarget = activeBuild.buildDebugTarget;
       }
       let debugConfig = await getLaunchConfigurationByName(
         wsConfig,
         debugTarget
       );
 
-      if (debugConfig) {
-        let res = await buildHelper(context, wsConfig, false);
+      if (debugConfig && activeProject && activeBuild) {
+        debugConfig.executable = '${command:zephyr-ide.get-active-build-path}/${command:zephyr-ide.get-active-project-name}/zephyr/zephyr.elf';
+        // Resolve all ${command:zephyr-ide.*} variables in debugConfig
+        async function resolveZephyrCommandsInObject(obj: Record<string, unknown>) {
+          for (const key of Object.keys(obj)) {
+            if (typeof obj[key] === "string") {
+              const strVal = obj[key] as string;
+              const matches = strVal.match(/\$\{command:zephyr-ide\.[^}]+\}/g);
+              if (matches) {
+                let newValue = strVal;
+                for (const match of matches) {
+                  const commandName = match.slice(10, -1); // Remove ${command: and }
+                  const result = await vscode.commands.executeCommand(commandName);
+                  const resultStr = result !== undefined ? String(result) : "";
+                  newValue = newValue.split(match).join(resultStr);
+                }
+                obj[key] = newValue;
+              }
+            }
+          }
+        }
+        await resolveZephyrCommandsInObject(debugConfig);
+        let res = await build(wsConfig, activeProject, activeBuild, false);
         if (res) {
           await vscode.commands.executeCommand(
             "debug.startFromConfig",

src/project_utilities/project.ts

@@ -789,7 +789,7 @@ export async function addRunner(wsConfig: WorkspaceConfig, context: vscode.Exten
   await addRunnerToBuild(wsConfig, context, wsConfig.activeProject, activeBuild);
 }
 
-export async function getActiveBuild(context: vscode.ExtensionContext, wsConfig: WorkspaceConfig) {
+export async function getActiveBuild(wsConfig: WorkspaceConfig) {
   if (wsConfig.activeProject === undefined) {
     return;
   }
@@ -804,7 +804,7 @@ export async function getActiveBuild(context: vscode.ExtensionContext, wsConfig:
 }
 
 export async function selectDebugLaunchConfiguration(context: vscode.ExtensionContext, wsConfig: WorkspaceConfig) {
-  let activeBuild = await getActiveBuild(context, wsConfig);
+  let activeBuild = await getActiveBuild(wsConfig);
   let newConfig = await selectLaunchConfiguration(wsConfig);
   if (activeBuild && newConfig) {
     activeBuild.launchTarget = newConfig;
@@ -813,7 +813,7 @@ export async function selectDebugLaunchConfiguration(context: vscode.ExtensionCo
 }
 
 export async function selectBuildDebugLaunchConfiguration(context: vscode.ExtensionContext, wsConfig: WorkspaceConfig) {
-  let activeBuild = await getActiveBuild(context, wsConfig);
+  let activeBuild = await getActiveBuild(wsConfig);
   let newConfig = await selectLaunchConfiguration(wsConfig);
   if (activeBuild && newConfig) {
     activeBuild.buildDebugTarget = newConfig;
@@ -822,7 +822,7 @@ export async function selectBuildDebugLaunchConfiguration(context: vscode.Extens
 }
 
 export async function selectDebugAttachLaunchConfiguration(context: vscode.ExtensionContext, wsConfig: WorkspaceConfig) {
-  let activeBuild = await getActiveBuild(context, wsConfig);
+  let activeBuild = await getActiveBuild(wsConfig);
   let newConfig = await selectLaunchConfiguration(wsConfig);
   if (activeBuild && newConfig) {
     activeBuild.attachTarget = newConfig;