test: Improve Test file loading performance

Author: RedCMD

src/test/baselines/FileTypes.json

@@ -1 +1 @@
-[{"ascii-textmate":["ASCII.textmate","fileTypes/ascii.property-list","fileTypes/firstLineASCII"],"coffeescript":["CSON.tmLanguage.cson"],"json-textmate":["DefinitionReferenceProvider.tmLanguage.json","DiagnosticCollection.tmLanguage.json","DocumentFormattingEditProvider-3spaces.tmLanguage.json","DocumentFormattingEditProvider-tabs.tmLanguage.json","JSON.tmLanguage.json","fileTypes/firstLineJSON","fileTypes/JSON.JSON-tmLanguage","fileTypes/json.tmGrammar.json","fileTypes/grammars/codeblock-markdown.json","fileTypes/grammars/javascript.tmLanguage copy 2 - Copy.json","fileTypes/grammars/javascript.tmLanguage copy 2.json","fileTypes/grammars/javascript.tmLanguage.json","fileTypes/syntaxes/code-block.json","fileTypes/syntaxes/injection.json","fileTypes/syntaxes/javascript.tmLanguage copy - Copy.json","fileTypes/syntaxes/javascript.tmLanguage copy.json"],"json":["package.json"],"xml":["XML.tmLanguage"],"yaml-textmate":["YAML.tmLanguage.yaml","fileTypes/YAML.YAML-tmLanguage","fileTypes/yml.tmLanguage.yml"],"tmgrammar-test":["fileTypes/baseline.baseline.txt","fileTypes/firstLineBASELINE","fileTypes/firstLineSNAP","fileTypes/hitt.hitt","fileTypes/snap.snap","fileTypes/tests/baselines/issue123.txt","fileTypes/syntaxes/fixtures/baselines/issue999.txt"],"json-textmate-regex":["fileTypes/regex.tmLanguage.json.regex"],"textmate-scopes":["fileTypes/textmate_scopes.txt"]}]
+[{"ascii-textmate":["fixtures/ASCII.textmate","fixtures/fileTypes/ascii.property-list","fixtures/fileTypes/firstLineASCII"],"coffeescript":["fixtures/CSON.tmLanguage.cson"],"json-textmate":["fixtures/DefinitionReferenceProvider.tmLanguage.json","fixtures/DiagnosticCollection.tmLanguage.json","fixtures/DocumentFormattingEditProvider-3spaces.tmLanguage.json","fixtures/DocumentFormattingEditProvider-tabs.tmLanguage.json","fixtures/JSON.tmLanguage.json","fixtures/fileTypes/JSON.JSON-tmLanguage","fixtures/fileTypes/firstLineJSON","fixtures/fileTypes/grammars/codeblock-markdown.json","fixtures/fileTypes/grammars/javascript.tmLanguage copy 2 - Copy.json","fixtures/fileTypes/grammars/javascript.tmLanguage copy 2.json","fixtures/fileTypes/grammars/javascript.tmLanguage.json","fixtures/fileTypes/json.tmGrammar.json","fixtures/fileTypes/syntaxes/code-block.json","fixtures/fileTypes/syntaxes/injection.json","fixtures/fileTypes/syntaxes/javascript.tmLanguage copy - Copy.json","fixtures/fileTypes/syntaxes/javascript.tmLanguage copy.json"],"xml":["fixtures/XML.tmLanguage"],"yaml-textmate":["fixtures/YAML.tmLanguage.yaml","fixtures/fileTypes/YAML.YAML-tmLanguage","fixtures/fileTypes/yml.tmLanguage.yml"],"tmgrammar-test":["fixtures/fileTypes/baseline.baseline.txt","fixtures/fileTypes/firstLineBASELINE","fixtures/fileTypes/firstLineSNAP","fixtures/fileTypes/hitt.hitt","fixtures/fileTypes/snap.snap","fixtures/fileTypes/syntaxes/fixtures/baselines/issue999.txt","fixtures/fileTypes/tests/baselines/issue123.txt"],"json-textmate-regex":["fixtures/fileTypes/regex.tmLanguage.json.regex"],"textmate-scopes":["fixtures/fileTypes/textmate_scopes.txt"],"json":["fixtures/package.json"]}]

src/test/suite/extension.test.ts

@@ -112,19 +112,16 @@ suite('Extension Tests', async () => {
 	});
 
 	test('Pre-load test Files', async () => {
-		const fixtures = await vscode.workspace.fs.readDirectory(fixturesUri);
-		const baselines = await vscode.workspace.fs.readDirectory(baselinesUri);
+		const files = await vscode.workspace.findFiles(
+			new vscode.RelativePattern(
+				workspaceFolder.uri,
+				'{fixtures,baselines}/**/*'
+			)
+		);
 		/* await */ Promise.allSettled(
-			[
-				fixtures.map((file) => vscode.window.showTextDocument(
-					vscode.Uri.joinPath(fixturesUri, file[0]),
-					showTextDocumentOptions
-				)),
-				baselines.map((file) => vscode.window.showTextDocument(
-					vscode.Uri.joinPath(baselinesUri, file[0]),
-					showTextDocumentOptions
-				)),
-			].flat(1)
+			files.map(
+				uri => vscode.window.showTextDocument(uri, showTextDocumentOptions)
+			)
 		);
 
 		// Diagnostics can be slow
@@ -144,32 +141,24 @@ suite('Extension Tests', async () => {
 	});
 
 	test('FileTypes', async () => {
-		const files = await vscode.workspace.fs.readDirectory(fixturesUri);
-		const languageIds: { [languageId: string]: string[]; } = {};
-
-		for (const file of files) {
-			const path = file[0];
-
-			if (path == 'fileTypes/ascii.tm-grammar.plist') {
-				// TODO: `fileTypes/ascii.tm-grammar.plist` should be `ascii-textmate`
+		const files = await vscode.workspace.findFiles(new vscode.RelativePattern(fixturesUri, '**/*'));
+		files.sort(); // Must be predictable
+		const documents = await Promise.all(files.map(uri => vscode.workspace.openTextDocument(uri)));
+
+		const languageIds: {
+			[languageId: string]: string[];
+		} = {};
+
+		for (const document of documents) {
+			const path = vscode.workspace.asRelativePath(document.uri, false);
+			if (path == 'fixtures/fileTypes/ascii.tm-grammar.plist') {
+				// TODO: `fixtures/fileTypes/ascii.tm-grammar.plist` should be `ascii-textmate`
 				// Works correctly in vscode-web
 				// Broken in VSCode desktop nodejs
 				continue;
 			}
 
-			if (file[1] === 2) {
-				const nestedFiles = await vscode.workspace.fs.readDirectory(vscode.Uri.joinPath(fixturesUri, path));
-				nestedFiles.forEach(file => file[0] = `${path}/${file[0]}`);
-				files.push(...nestedFiles);
-				continue;
-			}
-
-			const editor = await vscode.window.showTextDocument(
-				vscode.Uri.joinPath(fixturesUri, path),
-				showTextDocumentOptions,
-			);
-
-			const languageId = editor.document.languageId;
+			const languageId = document.languageId;
 			languageIds[languageId] ??= [];
 			languageIds[languageId].push(path);
 		}