Ensure we can change interpreters after trusting a workspace (#19353)

Fix changing of interpreters after a workspace is trusted

Author: Kartik Raj

src/client/common/configSettings.ts

@@ -507,6 +507,11 @@ export class PythonSettings implements IPythonSettings {
         }
     }
 
+    public register(): void {
+        PythonSettings.pythonSettings = new Map();
+        this.initialize();
+    }
+
     public initialize(): void {
         const onDidChange = () => {
             const currentConfig = this.workspace.getConfiguration('python', this.workspaceRoot);

src/client/common/types.ts

@@ -201,7 +201,7 @@ export interface IPythonSettings {
     readonly languageServerIsDefault: boolean;
     readonly defaultInterpreterPath: string;
     readonly tensorBoard: ITensorBoardSettings | undefined;
-    initialize(): void;
+    register(): void;
 }
 
 export interface ITensorBoardSettings {

src/client/extensionActivation.ts

@@ -124,7 +124,7 @@ async function activateLegacy(ext: ExtensionState): Promise<ActivationResult> {
 
     const configuration = serviceManager.get<IConfigurationService>(IConfigurationService);
     // Settings are dependent on Experiment service, so we need to initialize it after experiments are activated.
-    serviceContainer.get<IConfigurationService>(IConfigurationService).getSettings().initialize();
+    serviceContainer.get<IConfigurationService>(IConfigurationService).getSettings().register();
 
     // Language feature registrations.
     appRegisterTypes(serviceManager);

src/client/interpreter/interpreterService.ts

@@ -29,6 +29,7 @@ import { sendTelemetryEvent } from '../telemetry';
 import { EventName } from '../telemetry/constants';
 import { cache } from '../common/utils/decorators';
 import { PythonLocatorQuery, TriggerRefreshOptions } from '../pythonEnvironments/base/locator';
+import { sleep } from '../common/utils/async';
 
 type StoredPythonEnvironment = PythonEnvironment & { store?: boolean };
 
@@ -182,9 +183,13 @@ export class InterpreterService implements Disposable, IInterpreterService {
     }
 
     public async _onConfigChanged(resource?: Uri): Promise<void> {
-        this.didChangeInterpreterConfigurationEmitter.fire(resource);
-        // Check if we actually changed our python path
+        // Check if we actually changed our python path.
+        // Config service also updates itself on interpreter config change,
+        // so yielding control here to make sure it goes first and updates
+        // itself before we can query it.
+        await sleep(1);
         const pySettings = this.configService.getSettings(resource);
+        this.didChangeInterpreterConfigurationEmitter.fire(resource);
         if (this._pythonPathSetting === '' || this._pythonPathSetting !== pySettings.pythonPath) {
             this._pythonPathSetting = pySettings.pythonPath;
             this.didChangeInterpreterEmitter.fire();