💄

Benjamin Pasero · Benjamin Pasero · commit a65fb16cdde5 · 2019-04-03T15:48:03.000+02:00
diff --git a/src/vs/base/node/watcher.ts b/src/vs/base/node/watcher.ts
@@ -21,12 +21,14 @@ export function watchFolder(path: string, onChange: (type: 'added' | 'changed' |
 export const CHANGE_BUFFER_DELAY = 100;
 
 function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onChange: (type: 'added' | 'changed' | 'deleted', path: string) => void, onError: (error: string) => void): IDisposable {
+	const originalFileName = basename(file.path);
 	const mapPathToStatDisposable = new Map<string, IDisposable>();
 
 	let disposed = false;
-	let watcherDisposables: IDisposable[] = [];
-
-	const originalFileName = basename(file.path);
+	let watcherDisposables: IDisposable[] = [toDisposable(() => {
+		mapPathToStatDisposable.forEach(disposable => dispose(disposable));
+		mapPathToStatDisposable.clear();
+	})];
 
 	try {
 
@@ -84,7 +86,6 @@ function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onCha
 					// In addition, we send out a delete event if after a timeout we detect that the file
 					// does indeed not exist anymore.
 
-					// Wait a bit and try to install watcher again, assuming that the file was renamed quickly ("Atomic Save")
 					const timeoutHandle = setTimeout(async () => {
 						const fileExists = await exists(changedFilePath);
 
@@ -187,8 +188,5 @@ function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onCha
 		disposed = true;
 
 		watcherDisposables = dispose(watcherDisposables);
-
-		mapPathToStatDisposable.forEach(disposable => dispose(disposable));
-		mapPathToStatDisposable.clear();
 	});
 }
diff --git a/src/vs/workbench/services/files2/node/watcher/nodejs/watcherService.ts b/src/vs/workbench/services/files2/node/watcher/nodejs/watcherService.ts
@@ -96,23 +96,14 @@ export class FileWatcher extends Disposable {
 			}
 
 			// Fire
-			this.onFileEvents(normalizedFileChanges);
+			if (normalizedFileChanges.length > 0) {
+				this.onFileChanges(normalizedFileChanges);
+			}
 
 			return Promise.resolve();
 		});
 	}
 
-	private onFileEvents(events: IDiskFileChange[]): void {
-		if (this.isDisposed) {
-			return;
-		}
-
-		// Emit through event emitter
-		if (events.length > 0) {
-			this.onFileChanges(events);
-		}
-	}
-
 	private onError(error: string): void {
 		if (!this.isDisposed) {
 			this.errorLogger(error);
