Do not filter using scheme when filtering environments

microsoft · Aug 22, 2023 · 4171267 · 4171267
1 parent cfbf1f3
commit 4171267
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/client/common/utils/misc.ts b/src/client/common/utils/misc.ts
@@ -80,9 +80,8 @@ export function getURIFilter(
     }
     const uriRoot = `${uriPath}/`;
     function filter(candidate: Uri): boolean {
-        if (candidate.scheme !== uri.scheme) {
-            return false;
-        }
+        // Do not compare schemes as it is sometimes not available, in
+        // which case file is assumed as scheme.
         let candidatePath = candidate.path;
         while (candidatePath.endsWith('/')) {
             candidatePath = candidatePath.slice(0, -1);

diff --git a/src/client/pythonEnvironments/base/info/env.ts b/src/client/pythonEnvironments/base/info/env.ts
@@ -87,7 +87,13 @@ export function areEnvsDeepEqual(env1: PythonEnvInfo, env2: PythonEnvInfo): bool
     env2Clone.source = env2Clone.source.sort();
     const searchLocation1 = env1.searchLocation?.fsPath ?? '';
     const searchLocation2 = env2.searchLocation?.fsPath ?? '';
-    return isEqual(env1Clone, env2Clone) && arePathsSame(searchLocation1, searchLocation2);
+    const searchLocation1Scheme = env1.searchLocation?.scheme ?? '';
+    const searchLocation2Scheme = env2.searchLocation?.scheme ?? '';
+    return (
+        isEqual(env1Clone, env2Clone) &&
+        arePathsSame(searchLocation1, searchLocation2) &&
+        searchLocation1Scheme === searchLocation2Scheme
+    );
 }
 
 /**