files2 - try to fix tests

Benjamin Pasero · Benjamin Pasero · commit 834d72dc16b5 · 2019-04-03T14:55:30.000+02:00
diff --git a/src/vs/base/node/watcher.ts b/src/vs/base/node/watcher.ts
@@ -18,6 +18,8 @@ export function watchFolder(path: string, onChange: (type: 'added' | 'changed' |
 	return doWatchNonRecursive({ path, isDirectory: true }, onChange, onError);
 }
 
+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 mapPathToStatDisposable = new Map<string, IDisposable>();
 
@@ -101,7 +103,7 @@ function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onCha
 						else {
 							onChange('deleted', changedFilePath);
 						}
-					}, 300);
+					}, CHANGE_BUFFER_DELAY);
 
 					// Very important to dispose the watcher which now points to a stale inode
 					// and wire in a new disposable that tracks our timeout that is installed
@@ -151,7 +153,7 @@ function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onCha
 						}
 
 						onChange(type, changedFilePath);
-					}, 100);
+					}, CHANGE_BUFFER_DELAY);
 
 					mapPathToStatDisposable.set(changedFilePath, toDisposable(() => clearTimeout(timeoutHandle)));
 				}
diff --git a/src/vs/workbench/services/files2/node/watcher/nodejs/watcherService.ts b/src/vs/workbench/services/files2/node/watcher/nodejs/watcherService.ts
@@ -6,15 +6,15 @@
 import { IDiskFileChange, normalizeFileChanges } from 'vs/workbench/services/files2/node/watcher/normalizer';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { statLink, readlink } from 'vs/base/node/pfs';
-import { watchFolder, watchFile } from 'vs/base/node/watcher';
+import { watchFolder, watchFile, CHANGE_BUFFER_DELAY } from 'vs/base/node/watcher';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { join, basename } from 'vs/base/common/path';
 
 export class FileWatcher extends Disposable {
 	private isDisposed: boolean;
 
-	private fileChangesDelayer: ThrottledDelayer<void> = this._register(new ThrottledDelayer<void>(50));
+	private fileChangesDelayer: ThrottledDelayer<void> = this._register(new ThrottledDelayer<void>(CHANGE_BUFFER_DELAY * 2 /* sync on delay from underlying library */));
 	private fileChangesBuffer: IDiskFileChange[] = [];
 
 	constructor(

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ export function watchFolder(path: string, onChange: (type: 'added' \| 'changed' \|`
`18`	`18`	`return doWatchNonRecursive({ path, isDirectory: true }, onChange, onError);`
`19`	`19`	`}`
`20`	`20`
	`21`	`+export const CHANGE_BUFFER_DELAY = 100;`
	`22`	`+`
`21`	`23`	`function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onChange: (type: 'added' \| 'changed' \| 'deleted', path: string) => void, onError: (error: string) => void): IDisposable {`
`22`	`24`	`const mapPathToStatDisposable = new Map<string, IDisposable>();`
`23`	`25`
`@@ -101,7 +103,7 @@ function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onCha`
`101`	`103`	`else {`
`102`	`104`	`onChange('deleted', changedFilePath);`
`103`	`105`	`}`
`104`		`- }, 300);`
	`106`	`+ }, CHANGE_BUFFER_DELAY);`
`105`	`107`
`106`	`108`	`// Very important to dispose the watcher which now points to a stale inode`
`107`	`109`	`// and wire in a new disposable that tracks our timeout that is installed`
`@@ -151,7 +153,7 @@ function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onCha`
`151`	`153`	`}`
`152`	`154`
`153`	`155`	`onChange(type, changedFilePath);`
`154`		`- }, 100);`
	`156`	`+ }, CHANGE_BUFFER_DELAY);`
`155`	`157`
`156`	`158`	`mapPathToStatDisposable.set(changedFilePath, toDisposable(() => clearTimeout(timeoutHandle)));`
`157`	`159`	`}`