Merge from vscode 8a997f7321ae6612fc0e6eb3eac4f358a6233bfb

src/vs/base/node/pfs.ts

@@ -360,7 +360,7 @@ function doWriteFileAndFlush(path: string, data: string | Buffer | Uint8Array, o
 			}
 
 			// Flush contents (not metadata) of the file to disk
-			fs.fdatasync(fd, (syncError: Error) => {
+			fs.fdatasync(fd, (syncError: Error | null) => {
 
 				// In some exotic setups it is well possible that node fails to sync
 				// In that case we disable flushing and warn to the console

src/vs/base/node/processes.ts

@@ -409,7 +409,7 @@ export function createQueuedSender(childProcess: cp.ChildProcess): IQueuedSender
 			return;
 		}
 
-		const result = childProcess.send(msg, (error: Error) => {
+		const result = childProcess.send(msg, (error: Error | null) => {
 			if (error) {
 				console.error(error); // unlikely to happen, best we can do is log this error
 			}