From 01c3f16217a5777476e59fe8bd7fdb2bc87f26b6 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 4 Jul 2024 18:12:50 +1000
Subject: [PATCH] Rename category to kind (#23744)

---
 .../locators/common/nativePythonFinder.ts     |  2 +-
 .../composite/envsCollectionService.ts        | 39 +++++++++----------
 .../base/locators/lowLevel/nativeLocator.ts   |  2 +-
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
index 256ea54b62ac..d7ed825728e8 100644
--- a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
+++ b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts
@@ -28,7 +28,7 @@ export interface NativeEnvInfo {
     displayName?: string;
     name?: string;
     executable?: string;
-    category: string;
+    kind: string;
     version?: string;
     prefix?: string;
     manager?: NativeEnvManagerInfo;
diff --git a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
index 8ede842828a3..1c62bd6adee2 100644
--- a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
@@ -443,50 +443,49 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
 
         const nativeEnvironmentsWithoutPython = nativeEnvs.filter((e) => e.executable === undefined).length;
         const nativeCondaEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Conda,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Conda,
         ).length;
         const nativeCustomEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Custom,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Custom,
         ).length;
         const nativeMicrosoftStoreEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.MicrosoftStore,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.MicrosoftStore,
         ).length;
         const nativeOtherGlobalEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.OtherGlobal,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.OtherGlobal,
         ).length;
         const nativeOtherVirtualEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.OtherVirtual,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.OtherVirtual,
         ).length;
         const nativePipEnvEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Pipenv,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Pipenv,
         ).length;
         const nativePoetryEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Poetry,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Poetry,
         ).length;
         const nativePyenvEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Pyenv,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Pyenv,
         ).length;
         const nativeSystemEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.System,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.System,
         ).length;
         const nativeUnknownEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Unknown,
-        ).length;
-        const nativeVenvEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Venv,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Unknown,
         ).length;
+        const nativeVenvEnvs = nativeEnvs.filter((e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Venv)
+            .length;
         const nativeVirtualEnvEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.VirtualEnv,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.VirtualEnv,
         ).length;
         const nativeVirtualEnvWrapperEnvs = nativeEnvs.filter(
-            (e) => this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.VirtualEnvWrapper,
+            (e) => this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.VirtualEnvWrapper,
         ).length;
         const nativeGlobal = nativeEnvs.filter(
             (e) =>
-                this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.OtherGlobal ||
-                this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.System ||
-                this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.Custom ||
-                this.nativeFinder.categoryToKind(e.category) === PythonEnvKind.OtherVirtual,
+                this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.OtherGlobal ||
+                this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.System ||
+                this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.Custom ||
+                this.nativeFinder.categoryToKind(e.kind) === PythonEnvKind.OtherVirtual,
         ).length;
 
         // Intent is to capture time taken for discovery of all envs to complete the first time.
@@ -582,7 +581,7 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
                 if (!resolvedEnv) {
                     return;
                 }
-                const kind = this.nativeFinder.categoryToKind(e.category);
+                const kind = this.nativeFinder.categoryToKind(e.kind);
                 const nativeVersion = e.version ? parseVersion(e.version) : undefined;
                 if (
                     nativeVersion &&
diff --git a/src/client/pythonEnvironments/base/locators/lowLevel/nativeLocator.ts b/src/client/pythonEnvironments/base/locators/lowLevel/nativeLocator.ts
index 83a39ef35a8c..27dd9828c229 100644
--- a/src/client/pythonEnvironments/base/locators/lowLevel/nativeLocator.ts
+++ b/src/client/pythonEnvironments/base/locators/lowLevel/nativeLocator.ts
@@ -92,7 +92,7 @@ export class NativeLocator implements ILocator<BasicEnvInfo>, IDisposable {
             if (data.executable) {
                 const arch = (data.arch || '').toLowerCase();
                 const env: BasicEnvInfo = {
-                    kind: this.finder.categoryToKind(data.category),
+                    kind: this.finder.categoryToKind(data.kind),
                     executablePath: data.executable ? data.executable : '',
                     envPath: data.prefix ? data.prefix : undefined,
                     version: data.version ? parseVersion(data.version) : undefined,