From 15bb9748a533c148df3e2b5a202fb3e9e57731b6 Mon Sep 17 00:00:00 2001
From: Kartik Raj <karraj@microsoft.com>
Date: Mon, 21 Aug 2023 22:39:59 -0700
Subject: [PATCH] Do not filter using scheme when filtering environments
 (#21862)

For https://github.com/microsoft/vscode-python/issues/21825

On codespaces, it was leading to workspace environments not being
displayed, which could mess up auto-selection.
---
 src/client/common/utils/misc.ts                | 7 +++----
 src/client/pythonEnvironments/base/info/env.ts | 8 +++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/client/common/utils/misc.ts b/src/client/common/utils/misc.ts
index c95a3cc75575..455392d28eb1 100644
--- a/src/client/common/utils/misc.ts
+++ b/src/client/common/utils/misc.ts
@@ -60,7 +60,7 @@ function isUri(resource?: Uri | any): resource is Uri {
 /**
  * Create a filter func that determine if the given URI and candidate match.
  *
- * The scheme must match, as well as path.
+ * Only compares path.
  *
  * @param checkParent - if `true`, match if the candidate is rooted under `uri`
  * or if the candidate matches `uri` exactly.
@@ -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
index 2527f18202cd..12b3e519b944 100644
--- 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
+    );
 }
 
 /**