Skip to content

Get directories for global watching only if in global watching experiment #15871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karrtikr merged 1 commit into from
Apr 7, 2021
Merged

Get directories for global watching only if in global watching experiment #15871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/client/pythonEnvironments/base/locators/lowLevel/fsWatchingLocator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand All @@ -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));
}

Expand Down