Get directories for global watching only if in global watching experiment (microsoft#15871)

Kartik Raj · web-flow · commit 8ecc4a4a327a · 2021-04-07T12:39:48.000-07:00
diff --git a/src/client/pythonEnvironments/base/locators/lowLevel/fsWatchingLocator.ts b/src/client/pythonEnvironments/base/locators/lowLevel/fsWatchingLocator.ts
@@ -87,6 +87,15 @@ export abstract class FSWatchingLocator extends LazyResourceBasedLocator {
     }
 
     protected async initWatchers(): Promise<void> {
+        // Enable all workspace watchers.
+        if (this.watcherKind === FSWatcherKind.Global) {
+            // Enable global watchers only if the experiment allows it.
+            const enableGlobalWatchers = await inExperiment(DiscoveryVariants.discoverWithFileWatching);
+            if (!enableGlobalWatchers) {
+                return;
+            }
+        }
+
         // Start the FS watchers.
         let roots = await this.getRoots();
         if (typeof roots === 'string') {
@@ -104,15 +113,6 @@ export abstract class FSWatchingLocator extends LazyResourceBasedLocator {
         });
         const watchableRoots = (await Promise.all(promises)).filter((root) => !!root) as string[];
 
-        // Enable all workspace watchers.
-        if (this.watcherKind === FSWatcherKind.Global) {
-            // Enable global watchers only if the experiment allows it.
-            const enableGlobalWatchers = await inExperiment(DiscoveryVariants.discoverWithFileWatching);
-            if (!enableGlobalWatchers) {
-                return;
-            }
-        }
-
         watchableRoots.forEach((root) => this.startWatchers(root));
     }
 
