Skip to content

Commit 7dbb69a

Browse files
ahejlsbergahejlsberg
committed
Accepting new baselines
1 parent 1a4252d commit 7dbb69a

File tree

54 files changed

+497
-527
lines changed

Some content is hidden

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

54 files changed

+497
-527
lines changed

‎tests/baselines/reference/aliasUsageInOrExpression.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var d2: IHasVisualizationModel = i || moduleA;
3434
var d2: IHasVisualizationModel = moduleA || i;
3535
>d2 : IHasVisualizationModel
3636
>IHasVisualizationModel : IHasVisualizationModel
37-
>moduleA || i : IHasVisualizationModel
37+
>moduleA || i : typeof moduleA
3838
>moduleA : typeof moduleA
3939
>i : IHasVisualizationModel
4040

‎tests/baselines/reference/arrayBestCommonTypes.types

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ module EmptyTypes {
294294

295295
// Order matters here so test all the variants
296296
var a1 = [{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }];
297-
>a1 : { x: any; y: string; }[]
298-
>[{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }] : { x: any; y: string; }[]
297+
>a1 : ({ x: number; y: string; } | { x: string; y: string; } | { x: any; y: string; })[]
298+
>[{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }] : ({ x: number; y: string; } | { x: string; y: string; } | { x: any; y: string; })[]
299299
>{ x: 0, y: 'a' } : { x: number; y: string; }
300300
>x : number
301301
>0 : number
@@ -313,8 +313,8 @@ module EmptyTypes {
313313
>'a' : string
314314

315315
var a2 = [{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }];
316-
>a2 : { x: any; y: string; }[]
317-
>[{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }] : { x: any; y: string; }[]
316+
>a2 : ({ x: any; y: string; } | { x: number; y: string; } | { x: string; y: string; })[]
317+
>[{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }] : ({ x: any; y: string; } | { x: number; y: string; } | { x: string; y: string; })[]
318318
>{ x: anyObj, y: 'a' } : { x: any; y: string; }
319319
>x : any
320320
>anyObj : any
@@ -332,8 +332,8 @@ module EmptyTypes {
332332
>'a' : string
333333

334334
var a3 = [{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }];
335-
>a3 : { x: any; y: string; }[]
336-
>[{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }] : { x: any; y: string; }[]
335+
>a3 : ({ x: number; y: string; } | { x: any; y: string; } | { x: string; y: string; })[]
336+
>[{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }] : ({ x: number; y: string; } | { x: any; y: string; } | { x: string; y: string; })[]
337337
>{ x: 0, y: 'a' } : { x: number; y: string; }
338338
>x : number
339339
>0 : number
@@ -366,22 +366,22 @@ module EmptyTypes {
366366
>base2 : typeof base2
367367

368368
var b1 = [baseObj, base2Obj, ifaceObj];
369-
>b1 : iface[]
370-
>[baseObj, base2Obj, ifaceObj] : iface[]
369+
>b1 : base[]
370+
>[baseObj, base2Obj, ifaceObj] : base[]
371371
>baseObj : base
372372
>base2Obj : base2
373373
>ifaceObj : iface
374374

375375
var b2 = [base2Obj, baseObj, ifaceObj];
376-
>b2 : iface[]
377-
>[base2Obj, baseObj, ifaceObj] : iface[]
376+
>b2 : base2[]
377+
>[base2Obj, baseObj, ifaceObj] : base2[]
378378
>base2Obj : base2
379379
>baseObj : base
380380
>ifaceObj : iface
381381

382382
var b3 = [baseObj, ifaceObj, base2Obj];
383-
>b3 : iface[]
384-
>[baseObj, ifaceObj, base2Obj] : iface[]
383+
>b3 : base[]
384+
>[baseObj, ifaceObj, base2Obj] : base[]
385385
>baseObj : base
386386
>ifaceObj : iface
387387
>base2Obj : base2
@@ -639,7 +639,7 @@ module NonEmptyTypes {
639639
>x : number
640640
>y : base
641641
>base : base
642-
>[{ x: 7, y: new derived() }, { x: 5, y: new base() }] : { x: number; y: base; }[]
642+
>[{ x: 7, y: new derived() }, { x: 5, y: new base() }] : ({ x: number; y: derived; } | { x: number; y: base; })[]
643643
>{ x: 7, y: new derived() } : { x: number; y: derived; }
644644
>x : number
645645
>7 : number
@@ -658,7 +658,7 @@ module NonEmptyTypes {
658658
>x : boolean
659659
>y : base
660660
>base : base
661-
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : { x: boolean; y: base; }[]
661+
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: boolean; y: derived; } | { x: boolean; y: base; })[]
662662
>{ x: true, y: new derived() } : { x: boolean; y: derived; }
663663
>x : boolean
664664
>true : boolean
@@ -697,8 +697,8 @@ module NonEmptyTypes {
697697

698698
// Order matters here so test all the variants
699699
var a1 = [{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }];
700-
>a1 : { x: any; y: string; }[]
701-
>[{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }] : { x: any; y: string; }[]
700+
>a1 : ({ x: number; y: string; } | { x: string; y: string; } | { x: any; y: string; })[]
701+
>[{ x: 0, y: 'a' }, { x: 'a', y: 'a' }, { x: anyObj, y: 'a' }] : ({ x: number; y: string; } | { x: string; y: string; } | { x: any; y: string; })[]
702702
>{ x: 0, y: 'a' } : { x: number; y: string; }
703703
>x : number
704704
>0 : number
@@ -716,8 +716,8 @@ module NonEmptyTypes {
716716
>'a' : string
717717

718718
var a2 = [{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }];
719-
>a2 : { x: any; y: string; }[]
720-
>[{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }] : { x: any; y: string; }[]
719+
>a2 : ({ x: any; y: string; } | { x: number; y: string; } | { x: string; y: string; })[]
720+
>[{ x: anyObj, y: 'a' }, { x: 0, y: 'a' }, { x: 'a', y: 'a' }] : ({ x: any; y: string; } | { x: number; y: string; } | { x: string; y: string; })[]
721721
>{ x: anyObj, y: 'a' } : { x: any; y: string; }
722722
>x : any
723723
>anyObj : any
@@ -735,8 +735,8 @@ module NonEmptyTypes {
735735
>'a' : string
736736

737737
var a3 = [{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }];
738-
>a3 : { x: any; y: string; }[]
739-
>[{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }] : { x: any; y: string; }[]
738+
>a3 : ({ x: number; y: string; } | { x: any; y: string; } | { x: string; y: string; })[]
739+
>[{ x: 0, y: 'a' }, { x: anyObj, y: 'a' }, { x: 'a', y: 'a' }] : ({ x: number; y: string; } | { x: any; y: string; } | { x: string; y: string; })[]
740740
>{ x: 0, y: 'a' } : { x: number; y: string; }
741741
>x : number
742742
>0 : number
@@ -769,29 +769,29 @@ module NonEmptyTypes {
769769
>base2 : typeof base2
770770

771771
var b1 = [baseObj, base2Obj, ifaceObj];
772-
>b1 : iface[]
773-
>[baseObj, base2Obj, ifaceObj] : iface[]
772+
>b1 : (iface | base | base2)[]
773+
>[baseObj, base2Obj, ifaceObj] : (iface | base | base2)[]
774774
>baseObj : base
775775
>base2Obj : base2
776776
>ifaceObj : iface
777777

778778
var b2 = [base2Obj, baseObj, ifaceObj];
779-
>b2 : iface[]
780-
>[base2Obj, baseObj, ifaceObj] : iface[]
779+
>b2 : (iface | base | base2)[]
780+
>[base2Obj, baseObj, ifaceObj] : (iface | base | base2)[]
781781
>base2Obj : base2
782782
>baseObj : base
783783
>ifaceObj : iface
784784

785785
var b3 = [baseObj, ifaceObj, base2Obj];
786-
>b3 : iface[]
787-
>[baseObj, ifaceObj, base2Obj] : iface[]
786+
>b3 : (iface | base | base2)[]
787+
>[baseObj, ifaceObj, base2Obj] : (iface | base | base2)[]
788788
>baseObj : base
789789
>ifaceObj : iface
790790
>base2Obj : base2
791791

792792
var b4 = [ifaceObj, baseObj, base2Obj];
793-
>b4 : iface[]
794-
>[ifaceObj, baseObj, base2Obj] : iface[]
793+
>b4 : (iface | base | base2)[]
794+
>[ifaceObj, baseObj, base2Obj] : (iface | base | base2)[]
795795
>ifaceObj : iface
796796
>baseObj : base
797797
>base2Obj : base2

‎tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ var cs = [a, b, c]; // { x: number; y?: number };[]
3636
>c : { x: number; a?: number; }
3737

3838
var ds = [(x: Object) => 1, (x: string) => 2]; // { (x:Object) => number }[]
39-
>ds : ((x: Object) => number)[]
40-
>[(x: Object) => 1, (x: string) => 2] : ((x: Object) => number)[]
39+
>ds : (((x: Object) => number) | ((x: string) => number))[]
40+
>[(x: Object) => 1, (x: string) => 2] : (((x: Object) => number) | ((x: string) => number))[]
4141
>(x: Object) => 1 : (x: Object) => number
4242
>x : Object
4343
>Object : Object
@@ -47,8 +47,8 @@ var ds = [(x: Object) => 1, (x: string) => 2]; // { (x:Object) => number }[]
4747
>2 : number
4848

4949
var es = [(x: string) => 2, (x: Object) => 1]; // { (x:string) => number }[]
50-
>es : ((x: string) => number)[]
51-
>[(x: string) => 2, (x: Object) => 1] : ((x: string) => number)[]
50+
>es : (((x: string) => number) | ((x: Object) => number))[]
51+
>[(x: string) => 2, (x: Object) => 1] : (((x: string) => number) | ((x: Object) => number))[]
5252
>(x: string) => 2 : (x: string) => number
5353
>x : string
5454
>2 : number

‎tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ var myDerivedList: DerivedList<number>;
7777
>DerivedList : DerivedList<U>
7878

7979
var as = [list, myDerivedList]; // List<number>[]
80-
>as : List<number>[]
81-
>[list, myDerivedList] : List<number>[]
80+
>as : (List<number> | DerivedList<number>)[]
81+
>[list, myDerivedList] : (List<number> | DerivedList<number>)[]
8282
>list : List<number>
8383
>myDerivedList : DerivedList<number>
8484

‎tests/baselines/reference/arrayOfFunctionTypes3.types

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
// valid uses of arrays of function types
33

44
var x = [() => 1, () => { }];
5-
>x : (() => void)[]
6-
>[() => 1, () => { }] : (() => void)[]
5+
>x : ((() => number) | (() => void))[]
6+
>[() => 1, () => { }] : ((() => number) | (() => void))[]
77
>() => 1 : () => number
88
>1 : number
99
>() => { } : () => void
1010

1111
var r2 = x[0]();
1212
>r2 : void
1313
>x[0]() : void
14-
>x[0] : () => void
15-
>x : (() => void)[]
14+
>x[0] : (() => number) | (() => void)
15+
>x : ((() => number) | (() => void))[]
1616
>0 : number
1717

1818
class C {
@@ -50,28 +50,28 @@ var c: { (x: number): number; (x: any): any; };
5050
>x : any
5151

5252
var z = [a, b, c];
53-
>z : { (x: number): number; (x: any): any; }[]
54-
>[a, b, c] : { (x: number): number; (x: any): any; }[]
53+
>z : ({ (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; })[]
54+
>[a, b, c] : ({ (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; })[]
5555
>a : { (x: number): number; (x: string): string; }
5656
>b : { (x: number): number; (x: string): string; }
5757
>c : { (x: number): number; (x: any): any; }
5858

5959
var r4 = z[0];
60-
>r4 : { (x: number): number; (x: any): any; }
61-
>z[0] : { (x: number): number; (x: any): any; }
62-
>z : { (x: number): number; (x: any): any; }[]
60+
>r4 : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; }
61+
>z[0] : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; }
62+
>z : ({ (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; })[]
6363
>0 : number
6464

6565
var r5 = r4(''); // any not string
6666
>r5 : any
6767
>r4('') : any
68-
>r4 : { (x: number): number; (x: any): any; }
68+
>r4 : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; }
6969
>'' : string
7070

7171
var r5b = r4(1);
7272
>r5b : number
7373
>r4(1) : number
74-
>r4 : { (x: number): number; (x: any): any; }
74+
>r4 : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; }
7575
>1 : number
7676

7777
var a2: { <T>(x: T): number; (x: string): string;};
@@ -96,21 +96,21 @@ var c2: { (x: number): number; <T>(x: T): any; };
9696
>T : T
9797

9898
var z2 = [a2, b2, c2];
99-
>z2 : { (x: number): number; <T>(x: T): any; }[]
100-
>[a2, b2, c2] : { (x: number): number; <T>(x: T): any; }[]
99+
>z2 : ({ <T>(x: T): number; (x: string): string; } | { (x: number): number; <T>(x: T): any; })[]
100+
>[a2, b2, c2] : ({ <T>(x: T): number; (x: string): string; } | { (x: number): number; <T>(x: T): any; })[]
101101
>a2 : { <T>(x: T): number; (x: string): string; }
102102
>b2 : { <T>(x: T): number; (x: string): string; }
103103
>c2 : { (x: number): number; <T>(x: T): any; }
104104

105105
var r6 = z2[0];
106-
>r6 : { (x: number): number; <T>(x: T): any; }
107-
>z2[0] : { (x: number): number; <T>(x: T): any; }
108-
>z2 : { (x: number): number; <T>(x: T): any; }[]
106+
>r6 : { <T>(x: T): number; (x: string): string; } | { (x: number): number; <T>(x: T): any; }
107+
>z2[0] : { <T>(x: T): number; (x: string): string; } | { (x: number): number; <T>(x: T): any; }
108+
>z2 : ({ <T>(x: T): number; (x: string): string; } | { (x: number): number; <T>(x: T): any; })[]
109109
>0 : number
110110

111111
var r7 = r6(''); // any not string
112112
>r7 : any
113113
>r6('') : any
114-
>r6 : { (x: number): number; <T>(x: T): any; }
114+
>r6 : { <T>(x: T): number; (x: string): string; } | { (x: number): number; <T>(x: T): any; }
115115
>'' : string
116116

‎tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ var r = true ? 1 : 2;
4646
>2 : number
4747

4848
var r3 = true ? 1 : {};
49-
>r3 : {}
50-
>true ? 1 : {} : {}
49+
>r3 : number | {}
50+
>true ? 1 : {} : number | {}
5151
>true : boolean
5252
>1 : number
5353
>{} : {}
@@ -67,8 +67,8 @@ var r5 = true ? b : a; // typeof b
6767
>a : { x: number; y?: number; }
6868

6969
var r6 = true ? (x: number) => { } : (x: Object) => { }; // returns number => void
70-
>r6 : (x: number) => void
71-
>true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
70+
>r6 : ((x: number) => void) | ((x: Object) => void)
71+
>true ? (x: number) => { } : (x: Object) => { } : ((x: number) => void) | ((x: Object) => void)
7272
>true : boolean
7373
>(x: number) => { } : (x: number) => void
7474
>x : number
@@ -80,7 +80,7 @@ var r7: (x: Object) => void = true ? (x: number) => { } : (x: Object) => { };
8080
>r7 : (x: Object) => void
8181
>x : Object
8282
>Object : Object
83-
>true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
83+
>true ? (x: number) => { } : (x: Object) => { } : ((x: number) => void) | ((x: Object) => void)
8484
>true : boolean
8585
>(x: number) => { } : (x: number) => void
8686
>x : number
@@ -89,8 +89,8 @@ var r7: (x: Object) => void = true ? (x: number) => { } : (x: Object) => { };
8989
>Object : Object
9090

9191
var r8 = true ? (x: Object) => { } : (x: number) => { }; // returns Object => void
92-
>r8 : (x: Object) => void
93-
>true ? (x: Object) => { } : (x: number) => { } : (x: Object) => void
92+
>r8 : ((x: Object) => void) | ((x: number) => void)
93+
>true ? (x: Object) => { } : (x: number) => { } : ((x: Object) => void) | ((x: number) => void)
9494
>true : boolean
9595
>(x: Object) => { } : (x: Object) => void
9696
>x : Object
@@ -107,8 +107,8 @@ var r10: Base = true ? derived : derived2; // no error since we use the contextu
107107
>derived2 : Derived2
108108

109109
var r11 = true ? base : derived2;
110-
>r11 : Base
111-
>true ? base : derived2 : Base
110+
>r11 : Base | Derived2
111+
>true ? base : derived2 : Base | Derived2
112112
>true : boolean
113113
>base : Base
114114
>derived2 : Derived2

‎tests/baselines/reference/bestCommonTypeOfTuple.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ var e3 = t3[2]; // any
9898
>2 : number
9999

100100
var e4 = t4[3]; // number
101-
>e4 : number
102-
>t4[3] : number
101+
>e4 : number | E1 | E2
102+
>t4[3] : number | E1 | E2
103103
>t4 : [E1, E2, number]
104104
>3 : number
105105

‎tests/baselines/reference/bestCommonTypeOfTuple2.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ var t5: [C1, F]
6666
>F : F
6767

6868
var e11 = t1[4]; // base
69-
>e11 : base
70-
>t1[4] : base
69+
>e11 : base | C
70+
>t1[4] : base | C
7171
>t1 : [C, base]
7272
>4 : number
7373

@@ -78,14 +78,14 @@ var e21 = t2[4]; // {}
7878
>4 : number
7979

8080
var e31 = t3[4]; // C1
81-
>e31 : C1
82-
>t3[4] : C1
81+
>e31 : C1 | D1
82+
>t3[4] : C1 | D1
8383
>t3 : [C1, D1]
8484
>4 : number
8585

8686
var e41 = t4[2]; // base1
87-
>e41 : base1
88-
>t4[2] : base1
87+
>e41 : base1 | C1
88+
>t4[2] : base1 | C1
8989
>t4 : [base1, C1]
9090
>2 : number
9191

0 commit comments

Comments
 (0)