Skip to content

Commit d7eaa12

Browse files
RyanCavanaughRyanCavanaugh
committed
Merge pull request #5126 from RyanCavanaugh/noLibSymbolLines
Don't show lib.d.ts line numbers in symbol baselines
2 parents 53cff21 + 7280509 commit d7eaa12

File tree

482 files changed

+2720
-2718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

482 files changed

+2720
-2718
lines changed

‎src/harness/typeWriter.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ class TypeWriterWalker {
5757
symbolString += ", ";
5858
let declSourceFile = declaration.getSourceFile();
5959
let declLineAndCharacter = declSourceFile.getLineAndCharacterOfPosition(declaration.pos);
60-
symbolString += `Decl(${ ts.getBaseFileName(declSourceFile.fileName) }, ${ declLineAndCharacter.line }, ${ declLineAndCharacter.character })`;
60+
let fileName = ts.getBaseFileName(declSourceFile.fileName);
61+
let isLibFile = /lib(.*)\.d\.ts/i.test(fileName);
62+
symbolString += `Decl(${ fileName }, ${ isLibFile ? "--" : declLineAndCharacter.line }, ${ isLibFile ? "--" : declLineAndCharacter.character })`;
6163
}
6264
}
6365
symbolString += ")";

‎tests/baselines/reference/2dArrays.symbols‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ class Board {
2525
>allShipsSunk : Symbol(allShipsSunk, Decl(2dArrays.ts, 9, 18))
2626

2727
return this.ships.every(function (val) { return val.isSunk; });
28-
>this.ships.every : Symbol(Array.every, Decl(lib.d.ts, 1094, 62))
28+
>this.ships.every : Symbol(Array.every, Decl(lib.d.ts, --, --))
2929
>this.ships : Symbol(ships, Decl(2dArrays.ts, 7, 13))
3030
>this : Symbol(Board, Decl(2dArrays.ts, 5, 1))
3131
>ships : Symbol(ships, Decl(2dArrays.ts, 7, 13))
32-
>every : Symbol(Array.every, Decl(lib.d.ts, 1094, 62))
32+
>every : Symbol(Array.every, Decl(lib.d.ts, --, --))
3333
>val : Symbol(val, Decl(2dArrays.ts, 12, 42))
3434
>val.isSunk : Symbol(Ship.isSunk, Decl(2dArrays.ts, 3, 12))
3535
>val : Symbol(val, Decl(2dArrays.ts, 12, 42))

‎tests/baselines/reference/ES5SymbolType1.symbols‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var s: symbol;
33
>s : Symbol(s, Decl(ES5SymbolType1.ts, 0, 3))
44

55
s.toString();
6-
>s.toString : Symbol(Object.toString, Decl(lib.d.ts, 96, 26))
6+
>s.toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
77
>s : Symbol(s, Decl(ES5SymbolType1.ts, 0, 3))
8-
>toString : Symbol(Object.toString, Decl(lib.d.ts, 96, 26))
8+
>toString : Symbol(Object.toString, Decl(lib.d.ts, --, --))
99

‎tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.symbols‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ module A {
1111

1212
export var beez: Array<B>;
1313
>beez : Symbol(beez, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 5, 14))
14-
>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
14+
>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
1515
>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10))
1616

1717
export var beez2 = new Array<B>();
1818
>beez2 : Symbol(beez2, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 6, 14))
19-
>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
19+
>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
2020
>B : Symbol(B, Decl(ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts, 0, 10))
2121
}

‎tests/baselines/reference/TypeGuardWithArrayUnion.symbols‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ function saySize(message: Message | Message[]) {
1414

1515
if (message instanceof Array) {
1616
>message : Symbol(message, Decl(TypeGuardWithArrayUnion.ts, 4, 17))
17-
>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11))
17+
>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
1818

1919
return message.length; // Should have type Message[] here
20-
>message.length : Symbol(Array.length, Decl(lib.d.ts, 1007, 20))
20+
>message.length : Symbol(Array.length, Decl(lib.d.ts, --, --))
2121
>message : Symbol(message, Decl(TypeGuardWithArrayUnion.ts, 4, 17))
22-
>length : Symbol(Array.length, Decl(lib.d.ts, 1007, 20))
22+
>length : Symbol(Array.length, Decl(lib.d.ts, --, --))
2323
}
2424
}
2525

‎tests/baselines/reference/additionOperatorWithAnyAndEveryType.symbols‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var d: string;
3535

3636
var e: Object;
3737
>e : Symbol(e, Decl(additionOperatorWithAnyAndEveryType.ts, 12, 3))
38-
>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
38+
>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
3939

4040
// any as left operand, result is type Any except plusing string
4141
var r1 = a + a;

‎tests/baselines/reference/additionOperatorWithStringAndEveryType.symbols‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var d: string;
1919

2020
var e: Object;
2121
>e : Symbol(e, Decl(additionOperatorWithStringAndEveryType.ts, 6, 3))
22-
>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
22+
>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
2323

2424
var f: void;
2525
>f : Symbol(f, Decl(additionOperatorWithStringAndEveryType.ts, 7, 3))

‎tests/baselines/reference/anyAssignabilityInInheritance.symbols‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ var r3 = foo3(a); // any
5656
declare function foo5(x: Date): Date;
5757
>foo5 : Symbol(foo5, Decl(anyAssignabilityInInheritance.ts, 19, 17), Decl(anyAssignabilityInInheritance.ts, 21, 37))
5858
>x : Symbol(x, Decl(anyAssignabilityInInheritance.ts, 21, 22))
59-
>Date : Symbol(Date, Decl(lib.d.ts, 633, 23), Decl(lib.d.ts, 815, 11))
60-
>Date : Symbol(Date, Decl(lib.d.ts, 633, 23), Decl(lib.d.ts, 815, 11))
59+
>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
60+
>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
6161

6262
declare function foo5(x: any): any;
6363
>foo5 : Symbol(foo5, Decl(anyAssignabilityInInheritance.ts, 19, 17), Decl(anyAssignabilityInInheritance.ts, 21, 37))
@@ -71,8 +71,8 @@ var r3 = foo3(a); // any
7171
declare function foo6(x: RegExp): RegExp;
7272
>foo6 : Symbol(foo6, Decl(anyAssignabilityInInheritance.ts, 23, 17), Decl(anyAssignabilityInInheritance.ts, 25, 41))
7373
>x : Symbol(x, Decl(anyAssignabilityInInheritance.ts, 25, 22))
74-
>RegExp : Symbol(RegExp, Decl(lib.d.ts, 825, 1), Decl(lib.d.ts, 876, 11))
75-
>RegExp : Symbol(RegExp, Decl(lib.d.ts, 825, 1), Decl(lib.d.ts, 876, 11))
74+
>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
75+
>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
7676

7777
declare function foo6(x: any): any;
7878
>foo6 : Symbol(foo6, Decl(anyAssignabilityInInheritance.ts, 23, 17), Decl(anyAssignabilityInInheritance.ts, 25, 41))
@@ -277,8 +277,8 @@ var r3 = foo3(a); // any
277277
declare function foo17(x: Object): Object;
278278
>foo17 : Symbol(foo17, Decl(anyAssignabilityInInheritance.ts, 79, 17), Decl(anyAssignabilityInInheritance.ts, 81, 42))
279279
>x : Symbol(x, Decl(anyAssignabilityInInheritance.ts, 81, 23))
280-
>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
281-
>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
280+
>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
281+
>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
282282

283283
declare function foo17(x: any): any;
284284
>foo17 : Symbol(foo17, Decl(anyAssignabilityInInheritance.ts, 79, 17), Decl(anyAssignabilityInInheritance.ts, 81, 42))

‎tests/baselines/reference/anyAssignableToEveryType.symbols‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var d: boolean = a;
4444

4545
var e: Date = a;
4646
>e : Symbol(e, Decl(anyAssignableToEveryType.ts, 17, 3))
47-
>Date : Symbol(Date, Decl(lib.d.ts, 633, 23), Decl(lib.d.ts, 815, 11))
47+
>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
4848
>a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
4949

5050
var f: any = a;
@@ -57,7 +57,7 @@ var g: void = a;
5757

5858
var h: Object = a;
5959
>h : Symbol(h, Decl(anyAssignableToEveryType.ts, 20, 3))
60-
>Object : Symbol(Object, Decl(lib.d.ts, 92, 1), Decl(lib.d.ts, 223, 11))
60+
>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
6161
>a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
6262

6363
var i: {} = a;
@@ -70,7 +70,7 @@ var j: () => {} = a;
7070

7171
var k: Function = a;
7272
>k : Symbol(k, Decl(anyAssignableToEveryType.ts, 23, 3))
73-
>Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11))
73+
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
7474
>a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
7575

7676
var l: (x: number) => string = a;
@@ -109,20 +109,20 @@ var o: <T>(x: T) => T = a;
109109

110110
var p: Number = a;
111111
>p : Symbol(p, Decl(anyAssignableToEveryType.ts, 31, 3))
112-
>Number : Symbol(Number, Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
112+
>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
113113
>a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
114114

115115
var q: String = a;
116116
>q : Symbol(q, Decl(anyAssignableToEveryType.ts, 32, 3))
117-
>String : Symbol(String, Decl(lib.d.ts, 275, 1), Decl(lib.d.ts, 443, 11))
117+
>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
118118
>a : Symbol(a, Decl(anyAssignableToEveryType.ts, 0, 3))
119119

120120
function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
121121
>foo : Symbol(foo, Decl(anyAssignableToEveryType.ts, 32, 18))
122122
>T : Symbol(T, Decl(anyAssignableToEveryType.ts, 34, 13))
123123
>U : Symbol(U, Decl(anyAssignableToEveryType.ts, 34, 15))
124124
>V : Symbol(V, Decl(anyAssignableToEveryType.ts, 34, 32))
125-
>Date : Symbol(Date, Decl(lib.d.ts, 633, 23), Decl(lib.d.ts, 815, 11))
125+
>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
126126
>x : Symbol(x, Decl(anyAssignableToEveryType.ts, 34, 49))
127127
>T : Symbol(T, Decl(anyAssignableToEveryType.ts, 34, 13))
128128
>y : Symbol(y, Decl(anyAssignableToEveryType.ts, 34, 54))

‎tests/baselines/reference/anyInferenceAnonymousFunctions.symbols‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ var paired: any[];
33
>paired : Symbol(paired, Decl(anyInferenceAnonymousFunctions.ts, 0, 3))
44

55
paired.reduce(function (a1, a2) {
6-
>paired.reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
6+
>paired.reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
77
>paired : Symbol(paired, Decl(anyInferenceAnonymousFunctions.ts, 0, 3))
8-
>reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
8+
>reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
99
>a1 : Symbol(a1, Decl(anyInferenceAnonymousFunctions.ts, 2, 24))
1010
>a2 : Symbol(a2, Decl(anyInferenceAnonymousFunctions.ts, 2, 27))
1111

@@ -15,9 +15,9 @@ paired.reduce(function (a1, a2) {
1515
} , []);
1616

1717
paired.reduce((b1, b2) => {
18-
>paired.reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
18+
>paired.reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
1919
>paired : Symbol(paired, Decl(anyInferenceAnonymousFunctions.ts, 0, 3))
20-
>reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
20+
>reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
2121
>b1 : Symbol(b1, Decl(anyInferenceAnonymousFunctions.ts, 8, 15))
2222
>b2 : Symbol(b2, Decl(anyInferenceAnonymousFunctions.ts, 8, 18))
2323

@@ -27,24 +27,24 @@ paired.reduce((b1, b2) => {
2727
} , []);
2828

2929
paired.reduce((b3, b4) => b3.concat({}), []);
30-
>paired.reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
30+
>paired.reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
3131
>paired : Symbol(paired, Decl(anyInferenceAnonymousFunctions.ts, 0, 3))
32-
>reduce : Symbol(Array.reduce, Decl(lib.d.ts, 1129, 93), Decl(lib.d.ts, 1136, 120))
32+
>reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
3333
>b3 : Symbol(b3, Decl(anyInferenceAnonymousFunctions.ts, 13, 15))
3434
>b4 : Symbol(b4, Decl(anyInferenceAnonymousFunctions.ts, 13, 18))
3535
>b3 : Symbol(b3, Decl(anyInferenceAnonymousFunctions.ts, 13, 15))
3636

3737
paired.map((c1) => c1.count);
38-
>paired.map : Symbol(Array.map, Decl(lib.d.ts, 1115, 92))
38+
>paired.map : Symbol(Array.map, Decl(lib.d.ts, --, --))
3939
>paired : Symbol(paired, Decl(anyInferenceAnonymousFunctions.ts, 0, 3))
40-
>map : Symbol(Array.map, Decl(lib.d.ts, 1115, 92))
40+
>map : Symbol(Array.map, Decl(lib.d.ts, --, --))
4141
>c1 : Symbol(c1, Decl(anyInferenceAnonymousFunctions.ts, 15, 12))
4242
>c1 : Symbol(c1, Decl(anyInferenceAnonymousFunctions.ts, 15, 12))
4343

4444
paired.map(function (c2) { return c2.count; });
45-
>paired.map : Symbol(Array.map, Decl(lib.d.ts, 1115, 92))
45+
>paired.map : Symbol(Array.map, Decl(lib.d.ts, --, --))
4646
>paired : Symbol(paired, Decl(anyInferenceAnonymousFunctions.ts, 0, 3))
47-
>map : Symbol(Array.map, Decl(lib.d.ts, 1115, 92))
47+
>map : Symbol(Array.map, Decl(lib.d.ts, --, --))
4848
>c2 : Symbol(c2, Decl(anyInferenceAnonymousFunctions.ts, 16, 21))
4949
>c2 : Symbol(c2, Decl(anyInferenceAnonymousFunctions.ts, 16, 21))
5050

0 commit comments

Comments
 (0)