Fxi bug

Author: Kartik Raj

src/client/apiTypes.ts

@@ -104,7 +104,10 @@ export interface InterpretersChangedParams {
 }
 
 export interface ActiveInterpreterChangedParams {
-    interpreterPath?: string;
+    /**
+     * Interpreter path or environment path that uniquely identifies an environment.
+     */
+    path?: string;
     resource?: Uri;
 }
 

src/client/interpreter/display/index.ts

@@ -109,6 +109,12 @@ export class InterpreterDisplay implements IInterpreterDisplay, IExtensionSingle
     }
     private async updateDisplay(workspaceFolder?: Uri) {
         const interpreter = await this.interpreterService.getActiveInterpreter(workspaceFolder);
+        if (
+            this.currentlySelectedInterpreterDisplay &&
+            this.currentlySelectedInterpreterDisplay === interpreter?.detailedDisplayName
+        ) {
+            return;
+        }
         this.currentlySelectedWorkspaceFolder = workspaceFolder;
         if (this.statusBar) {
             if (interpreter) {

src/client/interpreter/interpreterService.ts

@@ -60,7 +60,7 @@ export class InterpreterService implements Disposable, IInterpreterService {
         return this.didChangeInterpreterConfigurationEmitter.event;
     }
 
-    public _currentInterpreterDisplay: string | undefined = '';
+    public _pythonPathSetting: string | undefined = '';
 
     private readonly didChangeInterpreterConfigurationEmitter = new EventEmitter<Uri | undefined>();
 
@@ -158,20 +158,16 @@ 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
-        const interpreter = await this.getActiveInterpreter(resource);
-        if (
-            this._currentInterpreterDisplay === '' ||
-            this._currentInterpreterDisplay !== interpreter?.detailedDisplayName
-        ) {
-            this._currentInterpreterDisplay = interpreter?.detailedDisplayName;
+        const pySettings = this.configService.getSettings(resource);
+        if (this._pythonPathSetting === '' || this._pythonPathSetting !== pySettings.pythonPath) {
+            this._pythonPathSetting = pySettings.pythonPath;
             this.didChangeInterpreterEmitter.fire();
-            const pySettings = this.configService.getSettings(resource);
             reportActiveInterpreterChanged({
-                interpreterPath: pySettings.pythonPath === '' ? undefined : pySettings.pythonPath,
+                path: pySettings.pythonPath === '' ? undefined : pySettings.pythonPath,
                 resource,
             });
-            const interpreterDisplay = this.serviceContainer.get<IInterpreterDisplay>(IInterpreterDisplay);
-            interpreterDisplay.refresh().catch((ex) => traceError('Python Extension: display.refresh', ex));
         }
+        const interpreterDisplay = this.serviceContainer.get<IInterpreterDisplay>(IInterpreterDisplay);
+        interpreterDisplay.refresh().catch((ex) => traceError('Python Extension: display.refresh', ex));
     }
 }

src/test/interpreters/interpreterService.unit.test.ts

@@ -248,7 +248,7 @@ suite('Interpreters service', () => {
     test('If stored setting is an empty string, refresh the interpreter display', async () => {
         const service = new InterpreterService(serviceContainer, pyenvs.object);
         const resource = Uri.parse('a');
-        service._currentInterpreterDisplay = '';
+        service._pythonPathSetting = '';
         configService.reset();
         configService.setup((c) => c.getSettings(resource)).returns(() => ({ pythonPath: 'current path' } as any));
         interpreterDisplay
@@ -266,7 +266,7 @@ suite('Interpreters service', () => {
     test('If stored setting is not equal to current interpreter path setting, refresh the interpreter display', async () => {
         const service = new InterpreterService(serviceContainer, pyenvs.object);
         const resource = Uri.parse('a');
-        service._currentInterpreterDisplay = 'stored setting';
+        service._pythonPathSetting = 'stored setting';
         configService.reset();
         configService.setup((c) => c.getSettings(resource)).returns(() => ({ pythonPath: 'current path' } as any));
         interpreterDisplay
@@ -284,7 +284,7 @@ suite('Interpreters service', () => {
     test('If stored setting is equal to current interpreter path setting, do not refresh the interpreter display', async () => {
         const service = new InterpreterService(serviceContainer, pyenvs.object);
         const resource = Uri.parse('a');
-        service._currentInterpreterDisplay = 'setting';
+        service._pythonPathSetting = 'setting';
         configService.reset();
         configService.setup((c) => c.getSettings(resource)).returns(() => ({ pythonPath: 'setting' } as any));
         interpreterDisplay