Hlleo

src/client/apiTypes.ts

@@ -245,17 +245,19 @@ export interface IProposedExtensionAPI {
         registerEnvironmentProvider(
             environmentProvider: IEnvironmentProvider,
             metadata: EnvironmentProviderMetadata,
-        ): Promise<void>;
+        ): Promise<void>; // TODO: Disposable??
     };
 }
 
 interface IEnvironmentProvider {
-    locator: ILocatorClass;
+    // TODO: createEnv
+    createLocator: (root?: string) => ILocatorAPI;
     getEnvironmentDetails: (env: EnvInfo) => Promise<EnvironmentDetails | undefined>;
 }
 
-export interface ILocatorClass {
-    new (root?: string): ILocatorAPI;
+export interface ILocatorFactory {
+    // This should be a function instead.
+    createLocator: (root?: string) => ILocatorAPI;
 }
 
 export interface ILocatorAPI {

src/client/pythonEnvironments/base/locators/wrappers.ts

@@ -3,7 +3,7 @@
 
 // eslint-disable-next-line max-classes-per-file
 import { Uri } from 'vscode';
-import { ILocatorClass } from '../../../apiTypes';
+import { ILocatorFactory } from '../../../apiTypes';
 import { IDisposable } from '../../../common/types';
 import { iterEmpty } from '../../../common/utils/async';
 import { getURIFilter } from '../../../common/utils/misc';
@@ -37,7 +37,7 @@ export class ExtensionLocators extends Locators<BasicEnvInfo> {
         return combineIterators(iterators);
     }
 
-    public addNewLocator(LocatorClass: ILocatorClass, isWorkspace: boolean): void {
+    public addNewLocator(LocatorClass: ILocatorFactory, isWorkspace: boolean): void {
         if (isWorkspace) {
             this.workspace.addNewLocator(LocatorClass);
         }
@@ -145,7 +145,7 @@ export class WorkspaceLocators extends LazyResourceBasedLocator<BasicEnvInfo> {
         );
     }
 
-    public addNewLocator(LocatorClass: ILocatorClass): void {
+    public addNewLocator(LocatorClass: ILocatorFactory): void {
         Object.keys(this.roots).forEach((key) => {
             const root = this.roots[key];
             const newLocator = new LocatorClass(root.fsPath);