Correctly compare environment objects

Author: Kartik Raj

src/client/common/utils/version.ts

@@ -70,11 +70,6 @@ export const EMPTY_VERSION: RawBasicVersionInfo = {
     major: -1,
     minor: -1,
     micro: -1,
-    unnormalized: {
-        major: undefined,
-        minor: undefined,
-        micro: undefined,
-    },
 };
 Object.freeze(EMPTY_VERSION);
 

src/client/extension.ts

@@ -159,6 +159,9 @@ async function activateUnsafe(
 
     const api = buildApi(activationPromise, ext.legacyIOC.serviceManager, ext.legacyIOC.serviceContainer);
     const proposedApi = buildProposedApi(components.pythonEnvs, ext.legacyIOC.serviceContainer);
+    proposedApi.environment.onDidChangeEnvironments((e) => {
+        console.log(JSON.stringify({ type: e.type, env: e.env.path }));
+    });
     return [{ ...api, ...proposedApi }, activationPromise, ext.legacyIOC.serviceContainer];
 }
 

src/client/pythonEnvironments/base/info/env.ts

@@ -78,9 +78,16 @@ export function buildEnvInfo(init?: {
 }
 
 export function areEnvsDeepEqual(env1: PythonEnvInfo, env2: PythonEnvInfo): boolean {
-    env1.source = env1.source.sort();
-    env2.source = env2.source.sort();
-    return isEqual(env1, env2);
+    const env1Clone = cloneDeep(env1);
+    const env2Clone = cloneDeep(env2);
+    // Cannot compare searchLocation as they are Uri objects.
+    delete env1Clone.searchLocation;
+    delete env2Clone.searchLocation;
+    env1Clone.source = env1Clone.source.sort();
+    env2Clone.source = env2Clone.source.sort();
+    const searchLocation1 = env1.searchLocation?.fsPath ?? '';
+    const searchLocation2 = env2.searchLocation?.fsPath ?? '';
+    return isEqual(env1Clone, env2Clone) && arePathsSame(searchLocation1, searchLocation2);
 }
 
 /**