Process only tsconfig-referenced files in compiler tests with tsconfig files (#54506)

Author: andrewbranch

src/harness/harnessIO.ts

@@ -556,7 +556,7 @@ export namespace Compiler {
             outputLines += content;
         }
         if (pretty) {
-            outputLines += ts.getErrorSummaryText(ts.getErrorCountForSummary(diagnostics), ts.getFilesInErrorForSummary(diagnostics), IO.newLine(), { getCurrentDirectory: () => "" });
+            outputLines += Utils.removeTestPathPrefixes(ts.getErrorSummaryText(ts.getErrorCountForSummary(diagnostics), ts.getFilesInErrorForSummary(diagnostics), IO.newLine(), { getCurrentDirectory: () => "" }));
         }
         return outputLines;
     }
@@ -597,6 +597,7 @@ export namespace Compiler {
             if (error.relatedInformation) {
                 for (const info of error.relatedInformation) {
                     let location = info.file ? " " + ts.formatLocation(info.file, info.start!, formatDiagnsoticHost, ts.identity) : "";
+                    location = Utils.removeTestPathPrefixes(location);
                     if (location && isDefaultLibraryFile(info.file!.fileName)) {
                         location = location.replace(/(lib(?:.*)\.d\.ts):\d+:\d+/i, "$1:--:--");
                     }
@@ -641,7 +642,7 @@ export namespace Compiler {
 
 
             // Header
-            outputLines += (newLine() + "==== " + inputFile.unitName + " (" + fileErrors.length + " errors) ====");
+            outputLines += (newLine() + "==== " + Utils.removeTestPathPrefixes(inputFile.unitName) + " (" + fileErrors.length + " errors) ====");
 
             // Make sure we emit something for every error
             let markedErrorCount = 0;
@@ -1282,8 +1283,31 @@ export namespace TestCaseParser {
         // unit tests always list files explicitly
         const parseConfigHost: ts.ParseConfigHost = {
             useCaseSensitiveFileNames: false,
-            readDirectory: () => [],
-            fileExists: () => true,
+            readDirectory: (directory, extensions, excludes, includes, depth) => {
+                return ts.matchFiles(directory, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ false, "", depth, dir => {
+                    const files: string[] = [];
+                    const directories = new Set<string>();
+                    for (const unit of testUnitData) {
+                        const unitName = ts.getNormalizedAbsolutePath(unit.name, rootDir);
+                        if (unitName.toLowerCase().startsWith(dir.toLowerCase())) {
+                            let path = unitName.substring(dir.length);
+                            if (path.startsWith("/")) {
+                                path = path.substring(1);
+                            }
+                            if (path.includes("/")) {
+                                const directoryName = path.substring(0, path.indexOf("/"));
+                                directories.add(directoryName);
+                            }
+                            else {
+                                files.push(path);
+                            }
+                        }
+                    }
+                    return { files, directories: ts.arrayFrom(directories) };
+
+                }, ts.identity);
+            },
+            fileExists: fileName => testUnitData.some(data => data.name.toLowerCase() === fileName.toLowerCase()),
             readFile: (name) => ts.forEach(testUnitData, data => data.name.toLowerCase() === name.toLowerCase() ? data.content : undefined)
         };
 
@@ -1299,8 +1323,7 @@ export namespace TestCaseParser {
                 if (rootDir) {
                     baseDir = ts.getNormalizedAbsolutePath(baseDir, rootDir);
                 }
-                tsConfig = ts.parseJsonSourceFileConfigFileContent(configJson, parseConfigHost, baseDir);
-                tsConfig.options.configFilePath = data.name;
+                tsConfig = ts.parseJsonSourceFileConfigFileContent(configJson, parseConfigHost, baseDir, /*existingOptions*/ undefined, ts.getNormalizedAbsolutePath(data.name, rootDir));
                 tsConfigFileUnitData = data;
 
                 // delete entry from the list

src/harness/util.ts

@@ -21,7 +21,7 @@ const replaceTypesVersionsMessage = createDiagnosticMessageReplacer(
     ([entry, , moduleName], compilerVersion) => [entry, compilerVersion, moduleName]);
 
 export function sanitizeTraceResolutionLogEntry(text: string) {
-    return text && removeTestPathPrefixes(replaceTypesVersionsMessage(text, "3.1.0-dev"));
+    return text && replaceTypesVersionsMessage(text, "3.1.0-dev");
 }
 
 /**
@@ -126,4 +126,4 @@ export function defer<T = void>(): Deferred<T> {
         reject = _reject;
     });
     return { resolve, reject, promise };
-}
+}

src/testRunner/compilerRunner.ts

@@ -13,6 +13,7 @@ import {
 } from "./_namespaces/Harness";
 import * as ts from "./_namespaces/ts";
 import * as Utils from "./_namespaces/Utils";
+import * as vfs from "./_namespaces/vfs";
 import * as vpath from "./_namespaces/vpath";
 
 export const enum CompilerTestType {
@@ -91,11 +92,12 @@ export class CompilerBaselineRunner extends RunnerBase {
         let compilerTest!: CompilerTest;
         before(() => {
             let payload;
+            let rootDir = ts.combinePaths(vfs.srcFolder, fileName.indexOf("conformance") === -1 ? "tests/cases/compiler/" : ts.getDirectoryPath(fileName) + "/");
             if (test && test.content) {
-                const rootDir = test.file.indexOf("conformance") === -1 ? "tests/cases/compiler/" : ts.getDirectoryPath(test.file) + "/";
+                rootDir = ts.combinePaths(vfs.srcFolder, test.file.indexOf("conformance") === -1 ? "tests/cases/compiler/" : ts.getDirectoryPath(test.file) + "/");
                 payload = TestCaseParser.makeUnitsFromTest(test.content, test.file, rootDir);
             }
-            compilerTest = new CompilerTest(fileName, payload, configuration);
+            compilerTest = new CompilerTest(fileName, rootDir, payload, configuration);
         });
         it(`Correct errors for ${fileName}`, () => compilerTest.verifyDiagnostics());
         it(`Correct module resolution tracing for ${fileName}`, () => compilerTest.verifyModuleResolution());
@@ -167,7 +169,6 @@ class CompilerTest {
     private fileName: string;
     private justName: string;
     private configuredName: string;
-    private lastUnit: TestCaseParser.TestUnitData;
     private harnessSettings: TestCaseParser.CompilerSettings;
     private hasNonDtsFiles: boolean;
     private result: compiler.CompilationResult;
@@ -178,7 +179,7 @@ class CompilerTest {
     // equivalent to other files on the file system not directly passed to the compiler (ie things that are referenced by other files)
     private otherFiles: Compiler.TestFile[];
 
-    constructor(fileName: string, testCaseContent?: TestCaseParser.TestCaseContent, configurationOverrides?: TestCaseParser.CompilerSettings) {
+    constructor(fileName: string, rootDir: string, testCaseContent?: TestCaseParser.TestCaseContent, configurationOverrides?: TestCaseParser.CompilerSettings) {
         this.fileName = fileName;
         this.justName = vpath.basename(fileName);
         this.configuredName = this.justName;
@@ -200,8 +201,6 @@ class CompilerTest {
             }
         }
 
-        const rootDir = fileName.indexOf("conformance") === -1 ? "tests/cases/compiler/" : ts.getDirectoryPath(fileName) + "/";
-
         if (testCaseContent === undefined) {
             testCaseContent = TestCaseParser.makeUnitsFromTest(IO.readFile(fileName)!, fileName, rootDir);
         }
@@ -211,43 +210,48 @@ class CompilerTest {
         }
 
         const units = testCaseContent.testUnitData;
+        this.toBeCompiled = [];
+        this.otherFiles = [];
+        this.hasNonDtsFiles = units.some(unit => !ts.fileExtensionIs(unit.name, ts.Extension.Dts));
         this.harnessSettings = testCaseContent.settings;
         let tsConfigOptions: ts.CompilerOptions | undefined;
         this.tsConfigFiles = [];
         if (testCaseContent.tsConfig) {
-            assert.equal(testCaseContent.tsConfig.fileNames.length, 0, `list of files in tsconfig is not currently supported`);
-            assert.equal(testCaseContent.tsConfig.raw.exclude, undefined, `exclude in tsconfig is not currently supported`);
-
             tsConfigOptions = ts.cloneCompilerOptions(testCaseContent.tsConfig.options);
-            this.tsConfigFiles.push(this.createHarnessTestFile(testCaseContent.tsConfigFileUnitData!, rootDir, ts.combinePaths(rootDir, tsConfigOptions.configFilePath)));
+            this.tsConfigFiles.push(this.createHarnessTestFile(testCaseContent.tsConfigFileUnitData!, rootDir, tsConfigOptions.configFilePath));
+            for (const unit of units) {
+                if (testCaseContent.tsConfig.fileNames.includes(ts.getNormalizedAbsolutePath(unit.name, rootDir))) {
+                    this.toBeCompiled.push(this.createHarnessTestFile(unit, rootDir));
+                }
+                else {
+                    this.otherFiles.push(this.createHarnessTestFile(unit, rootDir));
+                }
+            }
         }
         else {
             const baseUrl = this.harnessSettings.baseUrl;
             if (baseUrl !== undefined && !ts.isRootedDiskPath(baseUrl)) {
                 this.harnessSettings.baseUrl = ts.getNormalizedAbsolutePath(baseUrl, rootDir);
             }
-        }
-
-        this.lastUnit = units[units.length - 1];
-        this.hasNonDtsFiles = units.some(unit => !ts.fileExtensionIs(unit.name, ts.Extension.Dts));
-        // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test)
-        // If the last file in a test uses require or a triple slash reference we'll assume all other files will be brought in via references,
-        // otherwise, assume all files are just meant to be in the same compilation session without explicit references to one another.
-        this.toBeCompiled = [];
-        this.otherFiles = [];
 
-        if (testCaseContent.settings.noImplicitReferences || /require\(/.test(this.lastUnit.content) || /reference\spath/.test(this.lastUnit.content)) {
-            this.toBeCompiled.push(this.createHarnessTestFile(this.lastUnit, rootDir));
-            units.forEach(unit => {
-                if (unit.name !== this.lastUnit.name) {
-                    this.otherFiles.push(this.createHarnessTestFile(unit, rootDir));
-                }
-            });
-        }
-        else {
-            this.toBeCompiled = units.map(unit => {
-                return this.createHarnessTestFile(unit, rootDir);
-            });
+            const lastUnit = units[units.length - 1];
+            // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test)
+            // If the last file in a test uses require or a triple slash reference we'll assume all other files will be brought in via references,
+            // otherwise, assume all files are just meant to be in the same compilation session without explicit references to one another.
+
+            if (testCaseContent.settings.noImplicitReferences || /require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) {
+                this.toBeCompiled.push(this.createHarnessTestFile(lastUnit, rootDir));
+                units.forEach(unit => {
+                    if (unit.name !== lastUnit.name) {
+                        this.otherFiles.push(this.createHarnessTestFile(unit, rootDir));
+                    }
+                });
+            }
+            else {
+                this.toBeCompiled = units.map(unit => {
+                    return this.createHarnessTestFile(unit, rootDir);
+                });
+            }
         }
 
         if (tsConfigOptions && tsConfigOptions.configFilePath !== undefined) {

tests/baselines/reference/DateTimeFormatAndNumberFormatES2021.errors.txt

@@ -15,6 +15,6 @@ tests/cases/compiler/DateTimeFormatAndNumberFormatES2021.ts(5,25): error TS2551:
     new Intl.NumberFormat().formatRangeToParts
                             ~~~~~~~~~~~~~~~~~~
 !!! error TS2551: Property 'formatRangeToParts' does not exist on type 'NumberFormat'. Did you mean 'formatToParts'?
-!!! related TS2728 /.ts/lib.es2018.intl.d.ts:--:--: 'formatToParts' is declared here.
+!!! related TS2728 lib.es2018.intl.d.ts:--:--: 'formatToParts' is declared here.
     new Intl.DateTimeFormat().formatRange
     new Intl.DateTimeFormat().formatRangeToParts

tests/baselines/reference/asyncArrowFunction9_es2017.errors.txt

@@ -16,7 +16,7 @@ tests/cases/conformance/async/es2017/asyncArrowFunction/asyncArrowFunction9_es20
 !!! error TS1005: ',' expected.
                                           ~~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'Promise' must be of type 'PromiseConstructor', but here has type 'any'.
-!!! related TS6203 /.ts/lib.es2015.promise.d.ts:--:--: 'Promise' was also declared here.
+!!! related TS6203 lib.es2015.promise.d.ts:--:--: 'Promise' was also declared here.
                                                  ~
 !!! error TS1005: ',' expected.
                                                         ~~

tests/baselines/reference/asyncArrowFunction9_es5.errors.txt

@@ -16,7 +16,7 @@ tests/cases/conformance/async/es5/asyncArrowFunction/asyncArrowFunction9_es5.ts(
 !!! error TS1005: ',' expected.
                                           ~~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'Promise' must be of type 'PromiseConstructor', but here has type 'any'.
-!!! related TS6203 /.ts/lib.es2015.promise.d.ts:--:--: 'Promise' was also declared here.
+!!! related TS6203 lib.es2015.promise.d.ts:--:--: 'Promise' was also declared here.
                                                  ~
 !!! error TS1005: ',' expected.
                                                         ~~

tests/baselines/reference/asyncArrowFunction9_es6.errors.txt

@@ -16,7 +16,7 @@ tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction9_es6.ts(
 !!! error TS1005: ',' expected.
                                           ~~~~~~~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'Promise' must be of type 'PromiseConstructor', but here has type 'any'.
-!!! related TS6203 /.ts/lib.es2015.promise.d.ts:--:--: 'Promise' was also declared here.
+!!! related TS6203 lib.es2015.promise.d.ts:--:--: 'Promise' was also declared here.
                                                  ~
 !!! error TS1005: ',' expected.
                                                         ~~

tests/baselines/reference/baseCheck.errors.txt

@@ -21,7 +21,7 @@ tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'.
             super(0, loc);
                      ~~~
 !!! error TS2552: Cannot find name 'loc'. Did you mean 'Lock'?
-!!! related TS2728 /.ts/lib.dom.d.ts:--:--: 'Lock' is declared here.
+!!! related TS2728 lib.dom.d.ts:--:--: 'Lock' is declared here.
         }
 
         m() {