Make sure to check for 'files' when creating file watchers (#20006)

rchiodo · web-flow · commit cbb76d1e478f · 2022-10-17T10:51:43.000-07:00
Fixes #20005 

Root cause is roots coming from liveshare. Liveshare gives a
workspaceFolder of `vsls:/`.
diff --git a/src/client/pythonEnvironments/base/locators/common/resourceBasedLocator.ts b/src/client/pythonEnvironments/base/locators/common/resourceBasedLocator.ts
@@ -5,7 +5,7 @@ import { IDisposable } from '../../../../common/types';
 import { createDeferred, Deferred } from '../../../../common/utils/async';
 import { Disposables } from '../../../../common/utils/resourceLifecycle';
 import { traceError } from '../../../../logging';
-import { arePathsSame } from '../../../common/externalDependencies';
+import { arePathsSame, isVirtualWorkspace } from '../../../common/externalDependencies';
 import { getEnvPath } from '../../info/env';
 import { BasicEnvInfo, IPythonEnvsIterator, Locator, PythonLocatorQuery } from '../../locator';
 
@@ -123,10 +123,14 @@ export abstract class LazyResourceBasedLocator extends Locator<BasicEnvInfo> imp
             return;
         }
         this.watchersReady = createDeferred<void>();
-        await this.initWatchers().catch((ex) => {
-            traceError(ex);
-            this.watchersReady?.reject(ex);
-        });
+
+        // Don't create any file watchers in a virtual workspace.
+        if (!(await isVirtualWorkspace())) {
+            await this.initWatchers().catch((ex) => {
+                traceError(ex);
+                this.watchersReady?.reject(ex);
+            });
+        }
         this.watchersReady.resolve();
     }
 }
diff --git a/src/client/pythonEnvironments/common/externalDependencies.ts b/src/client/pythonEnvironments/common/externalDependencies.ts
@@ -4,6 +4,7 @@
 import * as fsapi from 'fs-extra';
 import * as path from 'path';
 import * as vscode from 'vscode';
+import { IWorkspaceService } from '../../common/application/types';
 import { ExecutionResult, IProcessServiceFactory, ShellOptions, SpawnOptions } from '../../common/process/types';
 import { IDisposable, IConfigurationService } from '../../common/types';
 import { chain, iterable } from '../../common/utils/async';
@@ -27,6 +28,13 @@ export async function exec(file: string, args: string[], options: SpawnOptions =
     return service.exec(file, args, options);
 }
 
+// Workspace
+
+export async function isVirtualWorkspace(): Promise<boolean> {
+    const service = internalServiceContainer.get<IWorkspaceService>(IWorkspaceService);
+    return service.isVirtualWorkspace;
+}
+
 // filesystem
 
 export function pathExists(absPath: string): Promise<boolean> {
diff --git a/src/test/pythonEnvironments/base/locators/envTestUtils.ts b/src/test/pythonEnvironments/base/locators/envTestUtils.ts
@@ -78,8 +78,12 @@ export function assertEnvsEqual(
 }
 
 export function assertBasicEnvsEqual(actualEnvs: BasicEnvInfo[], expectedEnvs: BasicEnvInfo[]): void {
-    actualEnvs = actualEnvs.sort((a, b) => a.executablePath.localeCompare(b.executablePath));
-    expectedEnvs = expectedEnvs.sort((a, b) => a.executablePath.localeCompare(b.executablePath));
+    actualEnvs = actualEnvs
+        .sort((a, b) => a.executablePath.localeCompare(b.executablePath))
+        .map((c) => ({ ...c, executablePath: c.executablePath.toLowerCase() }));
+    expectedEnvs = expectedEnvs
+        .sort((a, b) => a.executablePath.localeCompare(b.executablePath))
+        .map((c) => ({ ...c, executablePath: c.executablePath.toLowerCase() }));
     assert.deepStrictEqual(actualEnvs.length, expectedEnvs.length, 'Number of envs');
     zip(actualEnvs, expectedEnvs).forEach((value) => {
         const [actual, expected] = value;
