From b6d0e47a70f27a07673c01c83bd95f79e030daf0 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 27 Aug 2018 13:58:22 +0200 Subject: [PATCH] watcher - do not run extra glob matching --- .../files/node/watcher/unix/chokidarWatcherService.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts index ec8c491949c..0b62ad64ee4 100644 --- a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts @@ -113,7 +113,8 @@ export class ChokidarWatcherService implements IWatcherService { }; // if there's only one request, use the built-in ignore-filterering - if (requests.length === 1) { + const isSingleFolder = requests.length === 1; + if (isSingleFolder) { watcherOpts.ignored = requests[0].ignored; } @@ -194,8 +195,12 @@ export class ChokidarWatcherService implements IWatcherService { return; } - if (isIgnored(path, watcher.requests)) { - return; + // if there's more than one request we need to do + // extra filtering due to potentially overlapping roots + if (!isSingleFolder) { + if (isIgnored(path, watcher.requests)) { + return; + } } let event = { type: eventType, path }; -- GitLab