use getConfiguration launch to read debug config

espressif · Jul 25, 2024 · 1f6251a · 1f6251a
1 parent 9588ad6
commit 1f6251a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/cdtDebugAdapter/debugConfProvider.ts b/src/cdtDebugAdapter/debugConfProvider.ts
@@ -64,6 +64,7 @@ export class CDTDebugConfigurationProvider
  "mon reset halt",
  "maintenance flush register-cache",
  "thb app_main",
+ "c"
  ];
  }
 

diff --git a/src/extension.ts b/src/extension.ts
@@ -2633,13 +2633,14 @@ export async function activate(context: vscode.ExtensionContext) {
  );
  return;
  }
- const launchJson = await readJson(launchJsonPath);
- if (
- launchJson &&
- launchJson.configurations &&
- launchJson.configurations.length
- ) {
- for (const conf of launchJson.configurations) {
+ const config = vscode.workspace.getConfiguration("launch", workspaceRoot);
+
+ // retrieve values
+ const configurations = config.get(
+ "configurations"
+ ) as vscode.DebugConfiguration[];
+ if (configurations && configurations.length) {
+ for (const conf of configurations) {
  if (conf.type === "gdbtarget") {
  await vscode.debug.startDebugging(workspaceFolder, conf.name);
  return;

diff --git a/src/pythonManager.ts b/src/pythonManager.ts
@@ -247,7 +247,7 @@ export async function execProcessWithLog(
  undefined,
  undefined,
  cancelToken,
- pyTracker.Log
+ undefined
  );
  Logger.info(processResult + "\n");
  if (pyTracker) {