[VSC-1552] Resolve folder when using launch config from code-workspace (

#1397) * update env var collection resolve undefined folder * add current workspace as global state
espressif · Feb 6, 2025 · fbe6800 · fbe6800
1 parent 2fe9b8d
commit fbe6800
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/src/cdtDebugAdapter/debugConfProvider.ts b/src/cdtDebugAdapter/debugConfProvider.ts
@@ -20,7 +20,10 @@ import {
   CancellationToken,
   DebugConfiguration,
   DebugConfigurationProvider,
+  Uri,
   WorkspaceFolder,
+  window,
+  workspace,
 } from "vscode";
 import { readParameter } from "../idfConfiguration";
 import { getIdfTargetFromSdkconfig, getProjectName } from "../workspaceConfig";
@@ -31,6 +34,7 @@ import { OpenOCDManager } from "../espIdf/openOcd/openOcdManager";
 import { Logger } from "../logger/logger";
 import { getToolchainPath } from "../utils";
 import { createNewIdfMonitor } from "../espIdf/monitor/command";
+import { ESP } from "../config";
 
 export class CDTDebugConfigurationProvider
   implements DebugConfigurationProvider {
@@ -40,6 +44,20 @@ export class CDTDebugConfigurationProvider
     token?: CancellationToken
   ): Promise<DebugConfiguration> {
     try {
+      if (!folder) {
+        const workspaceFolderUri = ESP.GlobalConfiguration.store.get<Uri>(
+          ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER
+        );
+        folder = workspace.getWorkspaceFolder(workspaceFolderUri);
+        if (!folder) {
+          folder = await window.showWorkspaceFolderPick({
+            placeHolder: "Pick a workspace folder to start a debug session.",
+          });
+          if (!folder) {
+            throw new Error("No folder was selected to start debug session");
+          }
+        }
+      }
       if (!config.program) {
         const buildDirPath = readParameter("idf.buildPath", folder) as string;
         const projectName = await getProjectName(buildDirPath);

diff --git a/src/config.ts b/src/config.ts
@@ -48,6 +48,7 @@ export namespace ESP {
   export namespace GlobalConfiguration {
     export let store: ExtensionConfigStore;
     export const IDF_SETUPS = "IDF_SETUPS";
+    export const SELECTED_WORKSPACE_FOLDER = "SELECTED_WORKSPACE_FOLDER";
   }
 
   export const platformDepConfigurations: string[] = [

diff --git a/src/extension.ts b/src/extension.ts
@@ -323,6 +323,10 @@ export async function activate(context: vscode.ExtensionContext) {
   if (PreCheck.isWorkspaceFolderOpen()) {
     await createCmdsStatusBarItems(vscode.workspace.workspaceFolders[0].uri);
     workspaceRoot = initSelectedWorkspace(statusBarItems["workspace"]);
+    ESP.GlobalConfiguration.store.set(
+      ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER,
+      workspaceRoot
+    );
     await getIdfTargetFromSdkconfig(workspaceRoot, statusBarItems["target"]);
     if (statusBarItems && statusBarItems["port"]) {
       statusBarItems["port"].text =
@@ -408,6 +412,10 @@ export async function activate(context: vscode.ExtensionContext) {
         for (const ws of e.removed) {
           if (workspaceRoot && ws.uri === workspaceRoot) {
             workspaceRoot = initSelectedWorkspace(statusBarItems["workspace"]);
+            ESP.GlobalConfiguration.store.set(
+              ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER,
+              workspaceRoot
+            );
             await getIdfTargetFromSdkconfig(
               workspaceRoot,
               statusBarItems["target"]
@@ -451,6 +459,10 @@ export async function activate(context: vscode.ExtensionContext) {
         }
         if (typeof workspaceRoot === undefined) {
           workspaceRoot = initSelectedWorkspace(statusBarItems["workspace"]);
+          ESP.GlobalConfiguration.store.set(
+            ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER,
+            workspaceRoot
+          );
           await getIdfTargetFromSdkconfig(
             workspaceRoot,
             statusBarItems["target"]
@@ -965,6 +977,10 @@ export async function activate(context: vscode.ExtensionContext) {
           return;
         }
         workspaceRoot = option.uri;
+        ESP.GlobalConfiguration.store.set(
+          ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER,
+          workspaceRoot
+        );
         await getIdfTargetFromSdkconfig(
           workspaceRoot,
           statusBarItems["target"]