From 6b89c4f23f019efa565711bfd7e4c8d7c850fad4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 23 Sep 2021 11:00:55 +0200
Subject: [PATCH] watcher - :lipstick:

---
 .../platform/files/node/watcher/nsfw/nsfwWatcherService.ts  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
index 937614887f2..c1af151b546 100644
--- a/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/platform/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -356,7 +356,7 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 				}
 
 				// Watcher path came back! Restart watching...
-				if (path === watcher.request.path && type === 'added' || type === 'changed') {
+				if (path === watcher.request.path && (type === 'added' || type === 'changed')) {
 
 					// Stop watching that parent folder
 					disposable.dispose();
@@ -366,6 +366,10 @@ export class NsfwWatcherService extends Disposable implements IWatcherService {
 
 					// Restart the file watching delayed
 					const scheduler = new RunOnceScheduler(() => {
+						if (watcher.token.isCancellationRequested) {
+							return; // return early when disposed
+						}
+
 						this.warn('Watcher service restarts for watched path got created again', watcher);
 
 						this.restartWatching(watcher);
-- 
GitLab