Skip to content
Merged
Prev Previous commit
Next Next commit
Revert some unneeded test changes
  • Loading branch information
sandersn committed May 10, 2023
commit 586a892823a62932a9a1ccf2d5490110fe30139d
2 changes: 1 addition & 1 deletion tests/baselines/reference/cachedModuleResolution1.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//// [tests/cases/compiler/cachedModuleResolution1.ts] ////

//// [index.d.ts]
//// [foo.d.ts]
export declare let x: number

//// [app.ts]
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/cachedModuleResolution1.symbols
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== /a/b/node_modules/foo/index.d.ts ===
=== /a/b/node_modules/foo.d.ts ===
export declare let x: number
>x : Symbol(x, Decl(index.d.ts, 0, 18))
>x : Symbol(x, Decl(foo.d.ts, 0, 18))

=== /a/b/c/d/e/app.ts ===
import {x} from "foo";
Expand Down
12 changes: 4 additions & 8 deletions tests/baselines/reference/cachedModuleResolution1.trace.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@
"Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it.",
"Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it.",
"Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it.",
"File '/a/b/node_modules/foo/package.json' does not exist.",
"File '/a/b/node_modules/foo.ts' does not exist.",
"File '/a/b/node_modules/foo.tsx' does not exist.",
"File '/a/b/node_modules/foo.d.ts' does not exist.",
"File '/a/b/node_modules/foo/index.ts' does not exist.",
"File '/a/b/node_modules/foo/index.tsx' does not exist.",
"File '/a/b/node_modules/foo/index.d.ts' exists - use it as a name resolution result.",
"Resolving real path for '/a/b/node_modules/foo/index.d.ts', result '/a/b/node_modules/foo/index.d.ts'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo/index.d.ts'. ========",
"File '/a/b/node_modules/foo.d.ts' exists - use it as a name resolution result.",
"Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
"======== Resolving module 'foo' from '/a/b/c/lib.ts'. ========",
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, Declaration.",
"Resolution for module 'foo' was found in cache from location '/a/b/c'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo/index.d.ts'. ========",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
"======== Resolving module '@typescript/lib-es5' from '__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/cachedModuleResolution1.types
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
=== /a/b/node_modules/foo/index.d.ts ===
=== /a/b/node_modules/foo.d.ts ===
export declare let x: number
>x : number

Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/cachedModuleResolution2.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//// [tests/cases/compiler/cachedModuleResolution2.ts] ////

//// [index.d.ts]
//// [foo.d.ts]
export declare let x: number

//// [lib.ts]
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/cachedModuleResolution2.symbols
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== /a/b/node_modules/foo/index.d.ts ===
=== /a/b/node_modules/foo.d.ts ===
export declare let x: number
>x : Symbol(x, Decl(index.d.ts, 0, 18))
>x : Symbol(x, Decl(foo.d.ts, 0, 18))

=== /a/b/c/lib.ts ===
import {x} from "foo";
Expand Down
12 changes: 4 additions & 8 deletions tests/baselines/reference/cachedModuleResolution2.trace.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,18 @@
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, Declaration.",
"Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it.",
"File '/a/b/node_modules/foo/package.json' does not exist.",
"File '/a/b/node_modules/foo.ts' does not exist.",
"File '/a/b/node_modules/foo.tsx' does not exist.",
"File '/a/b/node_modules/foo.d.ts' does not exist.",
"File '/a/b/node_modules/foo/index.ts' does not exist.",
"File '/a/b/node_modules/foo/index.tsx' does not exist.",
"File '/a/b/node_modules/foo/index.d.ts' exists - use it as a name resolution result.",
"Resolving real path for '/a/b/node_modules/foo/index.d.ts', result '/a/b/node_modules/foo/index.d.ts'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo/index.d.ts'. ========",
"File '/a/b/node_modules/foo.d.ts' exists - use it as a name resolution result.",
"Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
"======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ========",
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, Declaration.",
"Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it.",
"Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it.",
"Resolution for module 'foo' was found in cache from location '/a/b/c'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo/index.d.ts'. ========",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
"======== Resolving module '@typescript/lib-es5' from '__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/cachedModuleResolution2.types
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
=== /a/b/node_modules/foo/index.d.ts ===
=== /a/b/node_modules/foo.d.ts ===
export declare let x: number
>x : number

Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/cachedModuleResolution5.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//// [tests/cases/compiler/cachedModuleResolution5.ts] ////

//// [index.d.ts]
//// [foo.d.ts]
export declare let x: number

//// [app.ts]
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/cachedModuleResolution5.symbols
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== /a/b/node_modules/foo/index.d.ts ===
=== /a/b/node_modules/foo.d.ts ===
export declare let x: number
>x : Symbol(x, Decl(index.d.ts, 0, 18))
>x : Symbol(x, Decl(foo.d.ts, 0, 18))

=== /a/b/c/d/e/app.ts ===
import {x} from "foo";
Expand Down
12 changes: 4 additions & 8 deletions tests/baselines/reference/cachedModuleResolution5.trace.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@
"Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it.",
"Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it.",
"Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it.",
"File '/a/b/node_modules/foo/package.json' does not exist.",
"File '/a/b/node_modules/foo.ts' does not exist.",
"File '/a/b/node_modules/foo.tsx' does not exist.",
"File '/a/b/node_modules/foo.d.ts' does not exist.",
"File '/a/b/node_modules/foo/index.ts' does not exist.",
"File '/a/b/node_modules/foo/index.tsx' does not exist.",
"File '/a/b/node_modules/foo/index.d.ts' exists - use it as a name resolution result.",
"Resolving real path for '/a/b/node_modules/foo/index.d.ts', result '/a/b/node_modules/foo/index.d.ts'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo/index.d.ts'. ========",
"File '/a/b/node_modules/foo.d.ts' exists - use it as a name resolution result.",
"Resolving real path for '/a/b/node_modules/foo.d.ts', result '/a/b/node_modules/foo.d.ts'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
"======== Resolving module 'foo' from '/a/b/lib.ts'. ========",
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, Declaration.",
"Resolution for module 'foo' was found in cache from location '/a/b'.",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo/index.d.ts'. ========",
"======== Module name 'foo' was successfully resolved to '/a/b/node_modules/foo.d.ts'. ========",
"======== Resolving module '@typescript/lib-es5' from '__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/cachedModuleResolution5.types
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
=== /a/b/node_modules/foo/index.d.ts ===
=== /a/b/node_modules/foo.d.ts ===
export declare let x: number
>x : number

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//// [tests/cases/compiler/importShouldNotBeElidedInDeclarationEmit.ts] ////

//// [index.d.ts]
//// [umd.d.ts]
export as namespace UMD;

export type Thing = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
=== tests/cases/compiler/node_modules/umd/index.d.ts ===
=== tests/cases/compiler/node_modules/umd.d.ts ===
export as namespace UMD;
>UMD : Symbol(UMD, Decl(index.d.ts, 0, 0))
>UMD : Symbol(UMD, Decl(umd.d.ts, 0, 0))

export type Thing = {
>Thing : Symbol(Thing, Decl(index.d.ts, 0, 24))
>Thing : Symbol(Thing, Decl(umd.d.ts, 0, 24))

a: number;
>a : Symbol(a, Decl(index.d.ts, 2, 21))
>a : Symbol(a, Decl(umd.d.ts, 2, 21))
}

export declare function makeThing(): Thing;
>makeThing : Symbol(makeThing, Decl(index.d.ts, 4, 1))
>Thing : Symbol(Thing, Decl(index.d.ts, 0, 24))
>makeThing : Symbol(makeThing, Decl(umd.d.ts, 4, 1))
>Thing : Symbol(Thing, Decl(umd.d.ts, 0, 24))

=== tests/cases/compiler/index.ts ===
import { makeThing } from "umd";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== tests/cases/compiler/node_modules/umd/index.d.ts ===
=== tests/cases/compiler/node_modules/umd.d.ts ===
export as namespace UMD;
>UMD : typeof import("tests/cases/compiler/node_modules/umd/index")
>UMD : typeof import("tests/cases/compiler/node_modules/umd")

export type Thing = {
>Thing : { a: number; }
Expand All @@ -14,10 +14,10 @@ export declare function makeThing(): Thing;

=== tests/cases/compiler/index.ts ===
import { makeThing } from "umd";
>makeThing : () => import("tests/cases/compiler/node_modules/umd/index").Thing
>makeThing : () => import("tests/cases/compiler/node_modules/umd").Thing

export const thing = makeThing();
>thing : import("tests/cases/compiler/node_modules/umd/index").Thing
>makeThing() : import("tests/cases/compiler/node_modules/umd/index").Thing
>makeThing : () => import("tests/cases/compiler/node_modules/umd/index").Thing
>thing : import("tests/cases/compiler/node_modules/umd").Thing
>makeThing() : import("tests/cases/compiler/node_modules/umd").Thing
>makeThing : () => import("tests/cases/compiler/node_modules/umd").Thing

2 changes: 1 addition & 1 deletion tests/baselines/reference/nodeResolution2.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//// [tests/cases/compiler/nodeResolution2.ts] ////

//// [index.d.ts]
//// [a.d.ts]
export var x: number;

//// [b.ts]
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/nodeResolution2.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import y = require("a");
>y : Symbol(y, Decl(b.ts, 0, 0))

=== tests/cases/compiler/node_modules/a/index.d.ts ===
=== tests/cases/compiler/node_modules/a.d.ts ===
export var x: number;
>x : Symbol(x, Decl(index.d.ts, 0, 10))
>x : Symbol(x, Decl(a.d.ts, 0, 10))

2 changes: 1 addition & 1 deletion tests/baselines/reference/nodeResolution2.types
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import y = require("a");
>y : typeof y

=== tests/cases/compiler/node_modules/a/index.d.ts ===
=== tests/cases/compiler/node_modules/a.d.ts ===
export var x: number;
>x : number

2 changes: 1 addition & 1 deletion tests/baselines/reference/nodeResolution5.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//// [tests/cases/compiler/nodeResolution5.ts] ////

//// [index.d.ts]
//// [a.d.ts]
declare module "a" {
var x: number;
}
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/nodeResolution5.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import y = require("a");
>y : Symbol(y, Decl(b.ts, 0, 0))

=== tests/cases/compiler/node_modules/a/index.d.ts ===
=== tests/cases/compiler/node_modules/a.d.ts ===
declare module "a" {
>"a" : Symbol("a", Decl(index.d.ts, 0, 0))
>"a" : Symbol("a", Decl(a.d.ts, 0, 0))

var x: number;
>x : Symbol(x, Decl(index.d.ts, 1, 7))
>x : Symbol(x, Decl(a.d.ts, 1, 7))
}

2 changes: 1 addition & 1 deletion tests/baselines/reference/nodeResolution5.types
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import y = require("a");
>y : typeof y

=== tests/cases/compiler/node_modules/a/index.d.ts ===
=== tests/cases/compiler/node_modules/a.d.ts ===
declare module "a" {
>"a" : typeof import("a")

Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/nodeResolution6.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//// [ref.ts]
var x = 1;

//// [index.d.ts]
//// [a.d.ts]
/// <reference path="ref.ts"/>
export declare var y;

Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/nodeResolution6.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
import y = require("a");
>y : Symbol(y, Decl(b.ts, 0, 0))

=== tests/cases/compiler/node_modules/a/ref.ts ===
=== tests/cases/compiler/node_modules/ref.ts ===
var x = 1;
>x : Symbol(x, Decl(ref.ts, 0, 3))

=== tests/cases/compiler/node_modules/a/index.d.ts ===
=== tests/cases/compiler/node_modules/a.d.ts ===
/// <reference path="ref.ts"/>
export declare var y;
>y : Symbol(y, Decl(index.d.ts, 1, 18))
>y : Symbol(y, Decl(a.d.ts, 1, 18))


4 changes: 2 additions & 2 deletions tests/baselines/reference/nodeResolution6.types
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import y = require("a");
>y : typeof y

=== tests/cases/compiler/node_modules/a/ref.ts ===
=== tests/cases/compiler/node_modules/ref.ts ===
var x = 1;
>x : number
>1 : 1

=== tests/cases/compiler/node_modules/a/index.d.ts ===
=== tests/cases/compiler/node_modules/a.d.ts ===
/// <reference path="ref.ts"/>
export declare var y;
>y : any
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export var y = 1;
//// [index.d.ts]
export var z: number;

//// [index.ts]
//// [file4.ts]
export var z1 = 1;


Expand All @@ -36,7 +36,7 @@ exports.x = 1;
Object.defineProperty(exports, "__esModule", { value: true });
exports.y = void 0;
exports.y = 1;
//// [index.js]
//// [file4.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.z1 = void 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export var y = 1;
export var z: number;
>z : Symbol(z, Decl(index.d.ts, 0, 10))

=== c:/node_modules/file4/index.ts ===
=== c:/node_modules/file4.ts ===
export var z1 = 1;
>z1 : Symbol(z1, Decl(index.ts, 0, 10))
>z1 : Symbol(z1, Decl(file4.ts, 0, 10))

Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,9 @@
"Loading module 'file4' from 'node_modules' folder, target file types: TypeScript, Declaration.",
"Directory 'c:/root/folder1/node_modules' does not exist, skipping all lookups in it.",
"Directory 'c:/root/node_modules' does not exist, skipping all lookups in it.",
"File 'c:/node_modules/file4/package.json' does not exist.",
"File 'c:/node_modules/file4.ts' does not exist.",
"File 'c:/node_modules/file4.tsx' does not exist.",
"File 'c:/node_modules/file4.d.ts' does not exist.",
"File 'c:/node_modules/file4/index.ts' exists - use it as a name resolution result.",
"Resolving real path for 'c:/node_modules/file4/index.ts', result 'c:/node_modules/file4/index.ts'.",
"======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4/index.ts'. ========",
"File 'c:/node_modules/file4.ts' exists - use it as a name resolution result.",
"Resolving real path for 'c:/node_modules/file4.ts', result 'c:/node_modules/file4.ts'.",
"======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4.ts'. ========",
"======== Resolving module '@typescript/lib-es5' from 'c:/root/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
"Explicitly specified module resolution kind: 'Node10'.",
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export var y = 1;
export var z: number;
>z : number

=== c:/node_modules/file4/index.ts ===
=== c:/node_modules/file4.ts ===
export var z1 = 1;
>z1 : number
>1 : 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export let b: number;
//// [index.d.ts]
export let x: number;

//// [index.d.ts]
//// [module3.d.ts]
export let y: number;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ export let b: number;
export let x: number;
>x : Symbol(x, Decl(index.d.ts, 0, 10))

=== c:/node_modules/module3/index.d.ts ===
=== c:/node_modules/module3.d.ts ===
export let y: number;
>y : Symbol(y, Decl(index.d.ts, 0, 10))
>y : Symbol(y, Decl(module3.d.ts, 0, 10))


Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,11 @@
"Loading module 'module3' from 'node_modules' folder, target file types: TypeScript, Declaration.",
"Directory 'c:/root/src/node_modules' does not exist, skipping all lookups in it.",
"Directory 'c:/root/node_modules' does not exist, skipping all lookups in it.",
"File 'c:/node_modules/module3/package.json' does not exist.",
"File 'c:/node_modules/module3.ts' does not exist.",
"File 'c:/node_modules/module3.tsx' does not exist.",
"File 'c:/node_modules/module3.d.ts' does not exist.",
"File 'c:/node_modules/module3/index.ts' does not exist.",
"File 'c:/node_modules/module3/index.tsx' does not exist.",
"File 'c:/node_modules/module3/index.d.ts' exists - use it as a name resolution result.",
"Resolving real path for 'c:/node_modules/module3/index.d.ts', result 'c:/node_modules/module3/index.d.ts'.",
"======== Module name 'module3' was successfully resolved to 'c:/node_modules/module3/index.d.ts'. ========",
"File 'c:/node_modules/module3.d.ts' exists - use it as a name resolution result.",
"Resolving real path for 'c:/node_modules/module3.d.ts', result 'c:/node_modules/module3.d.ts'.",
"======== Module name 'module3' was successfully resolved to 'c:/node_modules/module3.d.ts'. ========",
"======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========",
"Module resolution kind is not specified, using 'Node10'.",
"'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module1'.",
Expand Down
Loading