Fix for cached debug configuration (microsoft#17354)

karthiknadig · web-flow · commit 1fa549029bb0 · 2021-09-09T13:43:21.000-07:00
diff --git a/news/2 Fixes/17353.md b/news/2 Fixes/17353.md
@@ -0,0 +1 @@
+Fix for debug configuration used when no launch.json exists is still used after launch.json is created.
diff --git a/src/client/debugger/extension/configuration/debugConfigurationService.ts b/src/client/debugger/extension/configuration/debugConfigurationService.ts
@@ -80,18 +80,19 @@ export class PythonDebugConfigurationService implements IDebugConfigurationServi
             //                     editor context where it was triggered.
             throw Error('This configuration can only be used as defined by `purpose`.');
         } else {
-            if ((await this.experiments.inExperiment(CacheDebugConfig.experiment)) && this.cacheDebugConfig) {
-                debugConfiguration = cloneDeep(this.cacheDebugConfig);
-            }
             if (Object.keys(debugConfiguration).length === 0) {
-                const configs = await this.provideDebugConfigurations(folder, token);
-                if (configs === undefined) {
-                    return;
-                }
-                if (Array.isArray(configs) && configs.length === 1) {
-                    debugConfiguration = configs[0];
+                if ((await this.experiments.inExperiment(CacheDebugConfig.experiment)) && this.cacheDebugConfig) {
+                    debugConfiguration = cloneDeep(this.cacheDebugConfig);
+                } else {
+                    const configs = await this.provideDebugConfigurations(folder, token);
+                    if (configs === undefined) {
+                        return;
+                    }
+                    if (Array.isArray(configs) && configs.length === 1) {
+                        debugConfiguration = configs[0];
+                    }
+                    this.cacheDebugConfig = cloneDeep(debugConfiguration);
                 }
-                this.cacheDebugConfig = cloneDeep(debugConfiguration);
             }
             return this.launchResolver.resolveDebugConfiguration(
                 folder,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix for debug configuration used when no launch.json exists is still used after launch.json is created.`