Changes to conda paths not detected (microsoft#18725)

DonJayamanne · web-flow · commit 760aa0eaa994 · 2022-03-22T02:31:03.000+05:30
* Changes to conda paths not detected

* oops
diff --git a/src/client/pythonEnvironments/common/environmentManagers/conda.ts b/src/client/pythonEnvironments/common/environmentManagers/conda.ts
@@ -10,6 +10,7 @@ import {
     pathExists,
     readFile,
     shellExecute,
+    onDidChangePythonSetting,
 } from '../externalDependencies';
 
 import { PythonVersion, UNKNOWN_PYTHON_VERSION } from '../../base/info';
@@ -25,7 +26,7 @@ import { buildPythonExecInfo } from '../../exec';
 import { getExecutablePath } from '../../info/executable';
 
 export const AnacondaCompanyName = 'Anaconda, Inc.';
-
+export const CONDAPATH_SETTING_KEY = 'condaPath';
 export type CondaEnvironmentInfo = {
     name: string;
     path: string;
@@ -247,13 +248,17 @@ export class Conda {
      * @param command - Command used to spawn conda. This has the same meaning as the
      * first argument of spawn() - i.e. it can be a full path, or just a binary name.
      */
-    constructor(readonly command: string) {}
+    constructor(readonly command: string) {
+        onDidChangePythonSetting(CONDAPATH_SETTING_KEY, () => {
+            Conda.condaPromise = undefined;
+        });
+    }
 
     public static async getConda(): Promise<Conda | undefined> {
-        if (this.condaPromise === undefined || isTestExecution()) {
-            this.condaPromise = Conda.locate();
+        if (Conda.condaPromise === undefined || isTestExecution()) {
+            Conda.condaPromise = Conda.locate();
         }
-        return this.condaPromise;
+        return Conda.condaPromise;
     }
 
     /**
@@ -269,7 +274,7 @@ export class Conda {
 
         // Produce a list of candidate binaries to be probed by exec'ing them.
         async function* getCandidates() {
-            const customCondaPath = getPythonSetting<string>('condaPath');
+            const customCondaPath = getPythonSetting<string>(CONDAPATH_SETTING_KEY);
             if (customCondaPath && customCondaPath !== 'conda') {
                 // If user has specified a custom conda path, use it first.
                 yield customCondaPath;
diff --git a/src/client/pythonEnvironments/common/environmentManagers/condaService.ts b/src/client/pythonEnvironments/common/environmentManagers/condaService.ts
@@ -1,10 +1,7 @@
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { SemVer } from 'semver';
-import { ConfigurationChangeEvent, Uri } from 'vscode';
-import { IWorkspaceService } from '../../../common/application/types';
 import { IFileSystem, IPlatformService } from '../../../common/platform/types';
-import { IDisposableRegistry } from '../../../common/types';
 import { cache } from '../../../common/utils/decorators';
 import { ICondaService } from '../../../interpreter/contracts';
 import { traceDecoratorVerbose } from '../../../logging';
@@ -17,25 +14,17 @@ import { Conda, CondaEnvironmentInfo, CondaInfo } from './conda';
 export class CondaService implements ICondaService {
     private isAvailable: boolean | undefined;
 
-    private condaFile: Promise<string> | undefined;
-
     constructor(
         @inject(IPlatformService) private platform: IPlatformService,
         @inject(IFileSystem) private fileSystem: IFileSystem,
-        @inject(IDisposableRegistry) private disposableRegistry: IDisposableRegistry,
-        @inject(IWorkspaceService) private readonly workspaceService: IWorkspaceService,
-    ) {
-        this.addCondaPathChangedHandler();
-    }
+    ) {}
 
     /**
      * Return the path to the "conda file".
      */
+    // eslint-disable-next-line class-methods-use-this
     public async getCondaFile(): Promise<string> {
-        if (!this.condaFile) {
-            this.condaFile = Conda.getConda().then((conda) => conda?.command ?? 'conda');
-        }
-        return this.condaFile;
+        return Conda.getConda().then((conda) => conda?.command ?? 'conda');
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -123,19 +112,4 @@ export class CondaService implements ICondaService {
         const conda = await Conda.getConda();
         return conda?.getInfo();
     }
-
-    private addCondaPathChangedHandler() {
-        const disposable = this.workspaceService.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this));
-        this.disposableRegistry.push(disposable);
-    }
-
-    private async onDidChangeConfiguration(event: ConfigurationChangeEvent) {
-        const workspacesUris: (Uri | undefined)[] = this.workspaceService.hasWorkspaceFolders
-            ? this.workspaceService.workspaceFolders!.map((workspace) => workspace.uri)
-            : [undefined];
-        if (workspacesUris.findIndex((uri) => event.affectsConfiguration('python.condaPath', uri)) === -1) {
-            return;
-        }
-        this.condaFile = undefined;
-    }
 }
diff --git a/src/test/pythonEnvironments/discovery/locators/condaService.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/condaService.unit.test.ts
@@ -2,7 +2,6 @@ import * as assert from 'assert';
 import * as path from 'path';
 import * as TypeMoq from 'typemoq';
 import * as sinon from 'sinon';
-import { IWorkspaceService } from '../../../../client/common/application/types';
 import { FileSystemPaths, FileSystemPathUtils } from '../../../../client/common/platform/fs-paths';
 import { IFileSystem, IPlatformService } from '../../../../client/common/platform/types';
 import { CondaService } from '../../../../client/pythonEnvironments/common/environmentManagers/condaService';
@@ -12,9 +11,7 @@ suite('Interpreters Conda Service', () => {
     let platformService: TypeMoq.IMock<IPlatformService>;
     let condaService: CondaService;
     let fileSystem: TypeMoq.IMock<IFileSystem>;
-    let workspaceService: TypeMoq.IMock<IWorkspaceService>;
     setup(async () => {
-        workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();
         platformService = TypeMoq.Mock.ofType<IPlatformService>();
         fileSystem = TypeMoq.Mock.ofType<IFileSystem>();
 
@@ -27,7 +24,7 @@ suite('Interpreters Conda Service', () => {
                 return utils.arePathsSame(p1, p2);
             });
 
-        condaService = new CondaService(platformService.object, fileSystem.object, [], workspaceService.object);
+        condaService = new CondaService(platformService.object, fileSystem.object);
         sinon.stub(Conda, 'getConda').callsFake(() => Promise.resolve(undefined));
     });
     teardown(() => sinon.restore());
