Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

src/vs/base/node/pfs.ts

@@ -138,6 +138,20 @@ export async function readdir(path: string): Promise<string[]> {
 	return handleDirectoryChildren(await promisify(fs.readdir)(path));
 }
 
+export async function readdirWithFileTypes(path: string): Promise<fs.Dirent[]> {
+	const children = await promisify(fs.readdir)(path, { withFileTypes: true });
+
+	// Mac: uses NFD unicode form on disk, but we want NFC
+	// See also https://github.com/nodejs/node/issues/2165
+	if (platform.isMacintosh) {
+		for (const child of children) {
+			child.name = normalizeNFC(child.name);
+		}
+	}
+
+	return children;
+}
+
 export function readdirSync(path: string): string[] {
 	return handleDirectoryChildren(fs.readdirSync(path));
 }
@@ -226,7 +240,7 @@ export function readFile(path: string, encoding?: string): Promise<Buffer | stri
 // According to node.js docs (https://nodejs.org/docs/v6.5.0/api/fs.html#fs_fs_writefile_file_data_options_callback)
 // it is not safe to call writeFile() on the same path multiple times without waiting for the callback to return.
 // Therefor we use a Queue on the path that is given to us to sequentialize calls to the same path properly.
-const writeFilePathQueue: { [path: string]: Queue<void> } = Object.create(null);
+const writeFilePathQueues: Map<string, Queue<void>> = new Map();
 
 export function writeFile(path: string, data: string, options?: IWriteFileOptions): Promise<void>;
 export function writeFile(path: string, data: Buffer, options?: IWriteFileOptions): Promise<void>;
@@ -249,18 +263,20 @@ function toQueueKey(path: string): string {
 }
 
 function ensureWriteFileQueue(queueKey: string): Queue<void> {
-	let writeFileQueue = writeFilePathQueue[queueKey];
-	if (!writeFileQueue) {
-		writeFileQueue = new Queue<void>();
-		writeFilePathQueue[queueKey] = writeFileQueue;
-
-		const onFinish = Event.once(writeFileQueue.onFinished);
-		onFinish(() => {
-			delete writeFilePathQueue[queueKey];
-			writeFileQueue.dispose();
-		});
+	const existingWriteFileQueue = writeFilePathQueues.get(queueKey);
+	if (existingWriteFileQueue) {
+		return existingWriteFileQueue;
 	}
 
+	const writeFileQueue = new Queue<void>();
+	writeFilePathQueues.set(queueKey, writeFileQueue);
+
+	const onFinish = Event.once(writeFileQueue.onFinished);
+	onFinish(() => {
+		writeFilePathQueues.delete(queueKey);
+		writeFileQueue.dispose();
+	});
+
 	return writeFileQueue;
 }