From ccd7f4bec7b7e19098237af5cf6a3a7631de73be Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jun 2020 12:11:09 +0200 Subject: [PATCH 1/3] fixes #100364 --- src/vs/workbench/contrib/debug/browser/debugService.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts index 9442c66d0bcce..84b34e3025948 100644 --- a/src/vs/workbench/contrib/debug/browser/debugService.ts +++ b/src/vs/workbench/contrib/debug/browser/debugService.ts @@ -375,8 +375,6 @@ export class DebugService implements IDebugService { const unresolvedConfig = deepClone(config); if (options && options.noDebug) { config!.noDebug = true; - } else { - delete config!.noDebug; } if (!type) { From ccb5438c877c0b39b09308557b22ac14ce567307 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jun 2020 12:48:48 +0200 Subject: [PATCH 2/3] debug: only store dynamic configs in memory --- .../contrib/debug/browser/debugConfigurationManager.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts index 8b480e3dc7e1d..c3d41c15f42cd 100644 --- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts +++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts @@ -480,9 +480,10 @@ export class ConfigurationManager implements IConfigurationManager { this.setSelectedLaunchName(names.length ? names[0] : undefined); } - this.selectedConfig = config || (this.selectedLaunch && this.selectedName ? this.selectedLaunch.getConfiguration(this.selectedName) : undefined); - if (this.selectedConfig) { - this.debugConfigurationTypeContext.set(this.selectedConfig.type); + this.selectedConfig = config; + const configForType = this.selectedConfig || (this.selectedLaunch && this.selectedName ? this.selectedLaunch.getConfiguration(this.selectedName) : undefined); + if (configForType) { + this.debugConfigurationTypeContext.set(configForType.type); } else { this.debugConfigurationTypeContext.reset(); } From 6ffb34ce3daafcbaf917e537de70de3d351a146f Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jun 2020 14:50:10 +0200 Subject: [PATCH 3/3] Revert "debug: only store dynamic configs in memory" This reverts commit ccb5438c877c0b39b09308557b22ac14ce567307. --- .../contrib/debug/browser/debugConfigurationManager.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts index c3d41c15f42cd..8b480e3dc7e1d 100644 --- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts +++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts @@ -480,10 +480,9 @@ export class ConfigurationManager implements IConfigurationManager { this.setSelectedLaunchName(names.length ? names[0] : undefined); } - this.selectedConfig = config; - const configForType = this.selectedConfig || (this.selectedLaunch && this.selectedName ? this.selectedLaunch.getConfiguration(this.selectedName) : undefined); - if (configForType) { - this.debugConfigurationTypeContext.set(configForType.type); + this.selectedConfig = config || (this.selectedLaunch && this.selectedName ? this.selectedLaunch.getConfiguration(this.selectedName) : undefined); + if (this.selectedConfig) { + this.debugConfigurationTypeContext.set(this.selectedConfig.type); } else { this.debugConfigurationTypeContext.reset(); }