Strict null check nsfwWatcherService

src/tsconfig.strictNullChecks.json

@@ -692,7 +692,9 @@
 		"./vs/workbench/services/extensions/node/rpcProtocol.ts",
 		"./vs/workbench/services/files/electron-browser/encoding.ts",
 		"./vs/workbench/services/files/node/watcher/common.ts",
+		"./vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts",
 		"./vs/workbench/services/files/node/watcher/nsfw/watcher.ts",
+		"./vs/workbench/services/files/node/watcher/nsfw/watcherApp.ts",
 		"./vs/workbench/services/files/node/watcher/nsfw/watcherIpc.ts",
 		"./vs/workbench/services/files/node/watcher/nsfw/watcherService.ts",
 		"./vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts",

src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts

@@ -49,7 +49,7 @@ export class NsfwWatcherService implements IWatcherService {
 
 	private _watch(request: IWatcherRequest): void {
 		let undeliveredFileEvents: watcher.IRawFileChange[] = [];
-		const fileEventDelayer = new ThrottledDelayer(NsfwWatcherService.FS_EVENT_DELAY);
+		const fileEventDelayer = new ThrottledDelayer<void>(NsfwWatcherService.FS_EVENT_DELAY);
 
 		let readyPromiseResolve: (watcher: IWatcherObjet) => void;
 		this._pathWatchers[request.basePath] = {
@@ -104,7 +104,7 @@ export class NsfwWatcherService implements IWatcherService {
 
 				// Logging
 				if (this._verboseLogging) {
-					const logPath = e.action === nsfw.actions.RENAMED ? path.join(e.directory, e.oldFile) + ' -> ' + e.newFile : path.join(e.directory, e.file);
+					const logPath = e.action === nsfw.actions.RENAMED ? path.join(e.directory, e.oldFile || '') + ' -> ' + e.newFile : path.join(e.directory, e.file || '');
 					console.log(`${e.action === nsfw.actions.CREATED ? '[CREATED]' : e.action === nsfw.actions.DELETED ? '[DELETED]' : e.action === nsfw.actions.MODIFIED ? '[CHANGED]' : '[RENAMED]'} ${logPath}`);
 				}
 
@@ -112,20 +112,20 @@ export class NsfwWatcherService implements IWatcherService {
 				let absolutePath: string;
 				if (e.action === nsfw.actions.RENAMED) {
 					// Rename fires when a file's name changes within a single directory
-					absolutePath = path.join(e.directory, e.oldFile);
+					absolutePath = path.join(e.directory, e.oldFile || '');
 					if (!this._isPathIgnored(absolutePath, this._pathWatchers[request.basePath].ignored)) {
 						undeliveredFileEvents.push({ type: FileChangeType.DELETED, path: absolutePath });
 					} else if (this._verboseLogging) {
 						console.log(' >> ignored', absolutePath);
 					}
-					absolutePath = path.join(e.directory, e.newFile);
+					absolutePath = path.join(e.directory, e.newFile || '');
 					if (!this._isPathIgnored(absolutePath, this._pathWatchers[request.basePath].ignored)) {
 						undeliveredFileEvents.push({ type: FileChangeType.ADDED, path: absolutePath });
 					} else if (this._verboseLogging) {
 						console.log(' >> ignored', absolutePath);
 					}
 				} else {
-					absolutePath = path.join(e.directory, e.file);
+					absolutePath = path.join(e.directory, e.file || '');
 					if (!this._isPathIgnored(absolutePath, this._pathWatchers[request.basePath].ignored)) {
 						undeliveredFileEvents.push({
 							type: nsfwActionToRawChangeType[e.action],
@@ -166,7 +166,7 @@ export class NsfwWatcherService implements IWatcherService {
 					});
 				}
 
-				return Promise.resolve(null);
+				return Promise.resolve(void 0);
 			});
 		}).then(watcher => {
 			this._pathWatchers[request.basePath].watcher = watcher;
@@ -216,7 +216,7 @@ export class NsfwWatcherService implements IWatcherService {
 
 	public setVerboseLogging(enabled: boolean): Thenable<void> {
 		this._verboseLogging = enabled;
-		return Promise.resolve(null);
+		return Promise.resolve(void 0);
 	}
 
 	public stop(): Thenable<void> {