Allow low level custom locators to contain a single source

Author: Kartik Raj

src/client/pythonEnvironments/base/locator.ts

@@ -99,7 +99,7 @@ export interface ILocatorAPI {
 }
 
 export type EnvInfo = BaseEnvInfo & {
-    envSources: EnvSource[];
+    envSource: EnvSource[] | EnvSource;
 };
 
 export type BaseEnvInfo = {

src/client/pythonEnvironments/base/locatorUtils.ts

@@ -26,7 +26,7 @@ export function getQueryFilter(query: PythonLocatorQuery): (env: PythonEnvInfo)
         if (kinds === undefined) {
             return true;
         }
-        return kinds.includes(env.kind);
+        return kinds.includes(env.kind[0]);
     }
     function checkSearchLocation(env: PythonEnvInfo): boolean {
         if (env.searchLocation === undefined) {

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

@@ -18,6 +18,7 @@ import {
     IWorkspaceLocatorFactory,
     ILocatorRegister,
     ILocatorFactory,
+    InternalEnvironmentProviderMetadata,
 } from '../locator';
 import { combineIterators, Locators } from '../locators';
 import { LazyResourceBasedLocator } from './common/resourceBasedLocator';
@@ -51,11 +52,11 @@ export class ExtensionLocators extends Locators<BasicEnvInfo> implements ILocato
         return combineIterators(iterators);
     }
 
-    public addNewLocator(locatorFactory: ILocatorFactory): void {
+    public addNewLocator(locatorFactory: ILocatorFactory, metadata: InternalEnvironmentProviderMetadata): void {
         if (IsNonWorkspaceLocatorFactory(locatorFactory)) {
-            this.nonWorkspace = [...this.nonWorkspace, new ConvertLocator(locatorFactory())];
+            this.nonWorkspace = [...this.nonWorkspace, new ConvertLocator(locatorFactory(), metadata)];
         } else {
-            this.workspace.addNewLocator(locatorFactory);
+            this.workspace.addNewLocator(locatorFactory, metadata);
         }
     }
 }
@@ -158,11 +159,14 @@ export class WorkspaceLocators extends LazyResourceBasedLocator<BasicEnvInfo> {
         );
     }
 
-    public addNewLocator(locatorFactory: IWorkspaceLocatorFactory): void {
+    public addNewLocator(
+        locatorFactory: IWorkspaceLocatorFactory,
+        metadata: InternalEnvironmentProviderMetadata,
+    ): void {
         Object.keys(this.roots).forEach((key) => {
             const root = this.roots[key];
             const newLocator = locatorFactory(root.fsPath);
-            const convertedLocator: ILocator<BasicEnvInfo> = new ConvertLocator(newLocator);
+            const convertedLocator: ILocator<BasicEnvInfo> = new ConvertLocator(newLocator, metadata);
             const [locators] = this.locators[key];
             locators.addLocator(convertedLocator);
         });

src/client/pythonEnvironments/converter.ts

@@ -60,7 +60,7 @@ function convertDetailsAPI(proposed: ProposedDetailsAPI): InternalDetailsAPI {
             return undefined;
         }
         const envInfo = buildEnvInfo({
-            kind: convertKind(details.environment?.source[0] ?? PythonEnvKind.Unknown),
+            kind: details.environment?.source.map((k) => convertKind(k)),
             version: details.version,
             executable: details.executable.path,
             arch: details.executable.bitness,
@@ -165,11 +165,11 @@ export class ConvertLocator implements ILocator<BasicEnvInfo> {
     }
 
     private convertToBasicEnv(env: EnvInfo): BasicEnvInfo {
-        // TODO: Support multiple kinds
+        const sources = Array.isArray(env.envSource) ? env.envSource : [env.envSource];
         return {
             executablePath: env.executablePath,
             envPath: env.envPath,
-            kind: convertKind(env.envSources[0]),
+            kind: sources.map((s) => convertKind(s)),
             extensionId: this.metadata.extensionId,
         };
     }