From d91dda1259585e122bddae172ae6a9a0fedffb6d Mon Sep 17 00:00:00 2001 From: Paula Camargo Date: Mon, 15 Jul 2024 16:26:03 -0700 Subject: [PATCH 1/2] set workspace in get config --- .../extension/configuration/launch.json/launchJsonReader.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts b/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts index 1d76e3b8cd26..77b0909ea05b 100644 --- a/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts +++ b/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts @@ -12,11 +12,12 @@ export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder): const filename = path.join(workspace.uri.fsPath, '.vscode', 'launch.json'); if (!(await fs.pathExists(filename))) { // Check launch config in the workspace file - const codeWorkspaceConfig = getConfiguration('launch'); + const codeWorkspaceConfig = getConfiguration('launch', workspace); + console.log(codeWorkspaceConfig); if (!codeWorkspaceConfig.configurations || !Array.isArray(codeWorkspaceConfig.configurations)) { return []; } - traceLog(`Using launch configuration in workspace folder.`); + traceLog(`Using launch configuration in workspace folder2.`, codeWorkspaceConfig.configurations); return codeWorkspaceConfig.configurations; } From 63667e307b3645bccaef641d8ee460f6fd039509 Mon Sep 17 00:00:00 2001 From: Paula Camargo Date: Mon, 15 Jul 2024 17:20:09 -0700 Subject: [PATCH 2/2] clean code --- .../extension/configuration/launch.json/launchJsonReader.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts b/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts index 77b0909ea05b..ed326b585741 100644 --- a/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts +++ b/src/client/debugger/extension/configuration/launch.json/launchJsonReader.ts @@ -13,7 +13,6 @@ export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder): if (!(await fs.pathExists(filename))) { // Check launch config in the workspace file const codeWorkspaceConfig = getConfiguration('launch', workspace); - console.log(codeWorkspaceConfig); if (!codeWorkspaceConfig.configurations || !Array.isArray(codeWorkspaceConfig.configurations)) { return []; }