Merge pull request #23878 from Microsoft/vfsBaselines

New vfs baselines follow-up

Author: rbuckton

src/harness/fakes.ts

@@ -289,27 +289,7 @@ namespace fakes {
         }
 
         public getDefaultLibFileName(options: ts.CompilerOptions): string {
-            // return vpath.resolve(this.getDefaultLibLocation(), ts.getDefaultLibFileName(options));
-
-            // TODO(rbuckton): This patches the baseline to replace lib.es5.d.ts with lib.d.ts.
-            // This is only to make the PR for this change easier to read. A follow-up PR will
-            // revert this change and accept the new baselines.
-            // See https://github.com/Microsoft/TypeScript/pull/20763#issuecomment-352553264
-            return vpath.resolve(this.getDefaultLibLocation(), getDefaultLibFileName(options));
-            function getDefaultLibFileName(options: ts.CompilerOptions) {
-                switch (options.target) {
-                    case ts.ScriptTarget.ESNext:
-                    case ts.ScriptTarget.ES2017:
-                        return "lib.es2017.d.ts";
-                    case ts.ScriptTarget.ES2016:
-                        return "lib.es2016.d.ts";
-                    case ts.ScriptTarget.ES2015:
-                        return "lib.es2015.d.ts";
-
-                    default:
-                        return "lib.d.ts";
-                }
-            }
+            return vpath.resolve(this.getDefaultLibLocation(), ts.getDefaultLibFileName(options));
         }
 
         public getSourceFile(fileName: string, languageVersion: number): ts.SourceFile | undefined {

src/harness/projectsRunner.ts

@@ -219,13 +219,7 @@ namespace project {
                 .map(output => utils.removeTestPathPrefixes(vpath.isAbsolute(output) ? vpath.relative(cwd, output, ignoreCase) : output));
 
             const content = JSON.stringify(resolutionInfo, undefined, "    ");
-
-            // TODO(rbuckton): This patches the baseline to replace lib.es5.d.ts with lib.d.ts.
-            // This is only to make the PR for this change easier to read. A follow-up PR will
-            // revert this change and accept the new baselines.
-            // See https://github.com/Microsoft/TypeScript/pull/20763#issuecomment-352553264
-            const patchedContent = content.replace(/lib\.es5\.d\.ts/g, "lib.d.ts");
-            Harness.Baseline.runBaseline(this.getBaselineFolder(this.compilerResult.moduleKind) + this.testCaseJustName + ".json", () => patchedContent);
+            Harness.Baseline.runBaseline(this.getBaselineFolder(this.compilerResult.moduleKind) + this.testCaseJustName + ".json", () => content);
         }
 
         public verifyDiagnostics() {

src/harness/vfs.ts

@@ -1253,25 +1253,6 @@ namespace vfs {
         node: Inode | undefined;
     }
 
-    // TODO(rbuckton): This patches the baseline to replace lib.d.ts with lib.es5.d.ts.
-    // This is only to make the PR for this change easier to read. A follow-up PR will
-    // revert this change and accept the new baselines.
-    // See https://github.com/Microsoft/TypeScript/pull/20763#issuecomment-352553264
-    function patchResolver(host: FileSystemResolverHost, resolver: FileSystemResolver): FileSystemResolver {
-        const libFile = vpath.combine(host.getWorkspaceRoot(), "built/local/lib.d.ts");
-        const es5File = vpath.combine(host.getWorkspaceRoot(), "built/local/lib.es5.d.ts");
-        const stringComparer = host.useCaseSensitiveFileNames() ? vpath.compareCaseSensitive : vpath.compareCaseInsensitive;
-        return {
-            readdirSync: path => resolver.readdirSync(path),
-            statSync: path => resolver.statSync(fixPath(path)),
-            readFileSync: (path) => resolver.readFileSync(fixPath(path))
-        };
-
-        function fixPath(path: string) {
-            return stringComparer(path, libFile) === 0 ? es5File : path;
-        }
-    }
-
     let builtLocalHost: FileSystemResolverHost | undefined;
     let builtLocalCI: FileSystem | undefined;
     let builtLocalCS: FileSystem | undefined;
@@ -1286,7 +1267,7 @@ namespace vfs {
             const resolver = createResolver(host);
             builtLocalCI = new FileSystem(/*ignoreCase*/ true, {
                 files: {
-                    [builtFolder]: new Mount(vpath.resolve(host.getWorkspaceRoot(), "built/local"), patchResolver(host, resolver)),
+                    [builtFolder]: new Mount(vpath.resolve(host.getWorkspaceRoot(), "built/local"), resolver),
                     [testLibFolder]: new Mount(vpath.resolve(host.getWorkspaceRoot(), "tests/lib"), resolver),
                     [srcFolder]: {}
                 },

tests/baselines/reference/ES5For-of1.errors.txt

@@ -3,5 +3,8 @@ for (var v of ['a', 'b', 'c']) {
 >v : Symbol(v, Decl(ES5For-of1.ts, 0, 8))
 
     console.log(v);
+>console.log : Symbol(Console.log, Decl(lib.d.ts, --, --))
+>console : Symbol(console, Decl(lib.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.d.ts, --, --))
 >v : Symbol(v, Decl(ES5For-of1.ts, 0, 8))
 }

tests/baselines/reference/ES5For-of1.symbols

@@ -7,9 +7,9 @@ for (var v of ['a', 'b', 'c']) {
 >'c' : "c"
 
     console.log(v);
->console.log(v) : any
->console.log : any
->console : any
->log : any
+>console.log(v) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
 >v : string
 }

tests/baselines/reference/ES5For-of1.types

@@ -6,5 +6,8 @@ for (var x of [1, 2, 3]) {
 >_a : Symbol(_a, Decl(ES5For-of22.ts, 1, 7))
 
     console.log(x);
+>console.log : Symbol(Console.log, Decl(lib.d.ts, --, --))
+>console : Symbol(console, Decl(lib.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.d.ts, --, --))
 >x : Symbol(x, Decl(ES5For-of22.ts, 0, 8))
 }

tests/baselines/reference/ES5For-of22.errors.txt

@@ -11,9 +11,9 @@ for (var x of [1, 2, 3]) {
 >0 : 0
 
     console.log(x);
->console.log(x) : any
->console.log : any
->console : any
->log : any
+>console.log(x) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
 >x : number
 }