Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Feb 6, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d208403
update env var collection resolve undefined folder
brianignacio5 Jan 7, 2025
a03dec6
add current workspace as global state
brianignacio5 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/cdtDebugAdapter/debugConfProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ import {
CancellationToken,
DebugConfiguration,
DebugConfigurationProvider,
Uri,
WorkspaceFolder,
window,
workspace,
} from "vscode";
import { readParameter } from "../idfConfiguration";
import { getIdfTargetFromSdkconfig, getProjectName } from "../workspaceConfig";
Expand All @@ -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 {
Expand All @@ -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);
Expand Down
1 change: 1 addition & 0 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [
Expand Down
16 changes: 16 additions & 0 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,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 =
Expand Down Expand Up @@ -409,6 +413,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"]
Expand Down Expand Up @@ -452,6 +460,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"]
Expand Down Expand Up @@ -966,6 +978,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"]
Expand Down
Loading