lint

Eric Snow (ericsnowcurrently) · Sep 29, 2020 · Sep 22, 2020 · Sep 23, 2020 · Sep 23, 2020 · Sep 21, 2020
commit 20c46daceae752dcd121ef6e5d84446b170e4ab6
diff --git a/src/client/pythonEnvironments/base/info/pythonVersion.ts b/src/client/pythonEnvironments/base/info/pythonVersion.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { EMPTY_VERSION, parseBasicVersionInfo } from '../../../../client/common/utils/version';
+import { EMPTY_VERSION, parseBasicVersionInfo } from '../../../common/utils/version';
 
 import { PythonReleaseLevel, PythonVersion } from '.';
 

diff --git a/src/client/pythonEnvironments/base/locatorUtils.ts b/src/client/pythonEnvironments/base/locatorUtils.ts
@@ -30,28 +30,36 @@ export function getQueryFilter(query: PythonLocatorQuery): (env: PythonEnvInfo)
             }));
         }
     }
-    return (env) => {
-        if (kinds !== undefined) {
-            if (!kinds.includes(env.kind)) {
-                return false;
-            }
+    function checkKind(env: PythonEnvInfo): boolean {
+        if (kinds === undefined) {
+            return true;
         }
+        return kinds.includes(env.kind);
+    }
+    function checkSearchLocation(env: PythonEnvInfo): boolean {
         if (env.searchLocation === undefined) {
-            if (!includeGlobal) {
-                return false;
-            }
-        } else if (locationFilters === undefined) {
+            // It is not a "rooted" env.
+            return includeGlobal;
+        }
+
+        // It is a "rooted" env.
+        if (locationFilters === undefined) {
             if (query.searchLocations === null) {
+                // The caller explicitly refused rooted envs.
                 return false;
             }
-            if (query.searchLocations && query.searchLocations.length > 0) {
-                // Only envs without searchLocation set were requested?
-                return false;
-            }
-        } else {
-            if (!locationFilters.some((filter) => filter(env.searchLocation!))) {
-                return false;
-            }
+            // `query.searchLocations` only had `null` in it.
+            return !query.searchLocations || query.searchLocations.length === 0;
+        }
+        // Check against the requested roots.
+        return locationFilters.some((filter) => filter(env.searchLocation!));
+    }
+    return (env) => {
+        if (!checkKind(env)) {
+            return false;
+        }
+        if (!checkSearchLocation(env)) {
+            return false;
         }
         return true;
     };