Skip to content

Commit a82b1b2

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent 7ccbbfc commit a82b1b2

107 files changed

Lines changed: 325 additions & 325 deletions

File tree

Some content is hidden

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

‎tests/baselines/reference/argumentExpressionContextualTyping.types‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ var o1: { x: [string, number], y: { c: boolean, d: string, e: number } } = { x:
5151
>c : boolean
5252
>d : string
5353
>e : number
54-
>{ x: ["string", 1], y: { c: true, d: "world", e: 3 } } : { x: [string, number]; y: { c: true; d: string; e: number; }; }
54+
>{ x: ["string", 1], y: { c: true, d: "world", e: 3 } } : { x: [string, number]; y: { c: boolean; d: string; e: number; }; }
5555
>x : [string, number]
5656
>["string", 1] : [string, number]
5757
>"string" : "string"
5858
>1 : 1
59-
>y : { c: true; d: string; e: number; }
60-
>{ c: true, d: "world", e: 3 } : { c: true; d: string; e: number; }
59+
>y : { c: boolean; d: string; e: number; }
60+
>{ c: true, d: "world", e: 3 } : { c: boolean; d: string; e: number; }
6161
>c : boolean
6262
>true : true
6363
>d : string
@@ -96,7 +96,7 @@ var array = ["string", 1, true];
9696

9797
var tuple: [string, number, boolean] = ["string", 1, true];
9898
>tuple : [string, number, boolean]
99-
>["string", 1, true] : [string, number, true]
99+
>["string", 1, true] : [string, number, boolean]
100100
>"string" : "string"
101101
>1 : 1
102102
>true : true
@@ -109,7 +109,7 @@ baz(tuple);
109109
baz(["string", 1, true]);
110110
>baz(["string", 1, true]) : void
111111
>baz : (x: [string, number, boolean]) => void
112-
>["string", 1, true] : [string, number, true]
112+
>["string", 1, true] : [string, number, boolean]
113113
>"string" : "string"
114114
>1 : 1
115115
>true : true

‎tests/baselines/reference/arrayBestCommonTypes.types‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,14 @@ module EmptyTypes {
255255
>x : boolean
256256
>y : base
257257
>base : base
258-
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
259-
>{ x: true, y: new derived() } : { x: true; y: derived; }
258+
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : { x: boolean; y: derived; }[]
259+
>{ x: true, y: new derived() } : { x: boolean; y: derived; }
260260
>x : boolean
261261
>true : true
262262
>y : derived
263263
>new derived() : derived
264264
>derived : typeof derived
265-
>{ x: false, y: new base() } : { x: false; y: base; }
265+
>{ x: false, y: new base() } : { x: boolean; y: base; }
266266
>x : boolean
267267
>false : false
268268
>y : base
@@ -658,14 +658,14 @@ module NonEmptyTypes {
658658
>x : boolean
659659
>y : base
660660
>base : base
661-
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
662-
>{ x: true, y: new derived() } : { x: true; y: derived; }
661+
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : { x: boolean; y: base; }[]
662+
>{ x: true, y: new derived() } : { x: boolean; y: derived; }
663663
>x : boolean
664664
>true : true
665665
>y : derived
666666
>new derived() : derived
667667
>derived : typeof derived
668-
>{ x: false, y: new base() } : { x: false; y: base; }
668+
>{ x: false, y: new base() } : { x: boolean; y: base; }
669669
>x : boolean
670670
>false : false
671671
>y : base

‎tests/baselines/reference/arrayLiterals3.errors.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(10,5): error TS2322: Type 'undefined[]' is not assignable to type '[any, any, any]'.
22
Property '0' is missing in type 'undefined[]'.
3-
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,5): error TS2322: Type '["string", number, boolean]' is not assignable to type '[boolean, string, number]'.
4-
Type '"string"' is not assignable to type 'boolean'.
3+
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,5): error TS2322: Type '[string, number, boolean]' is not assignable to type '[boolean, string, number]'.
4+
Type 'string' is not assignable to type 'boolean'.
55
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(17,5): error TS2322: Type '[number, number, string, boolean]' is not assignable to type '[number, number]'.
66
Types of property 'length' are incompatible.
77
Type '4' is not assignable to type '2'.
@@ -34,8 +34,8 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
3434
!!! error TS2322: Property '0' is missing in type 'undefined[]'.
3535
var a1: [boolean, string, number] = ["string", 1, true]; // Error
3636
~~
37-
!!! error TS2322: Type '["string", number, boolean]' is not assignable to type '[boolean, string, number]'.
38-
!!! error TS2322: Type '"string"' is not assignable to type 'boolean'.
37+
!!! error TS2322: Type '[string, number, boolean]' is not assignable to type '[boolean, string, number]'.
38+
!!! error TS2322: Type 'string' is not assignable to type 'boolean'.
3939

4040
// The resulting type an array literal expression is determined as follows:
4141
// - If the array literal contains no spread elements and is an array assignment pattern in a destructuring assignment (section 4.17.1),

‎tests/baselines/reference/arrayLiterals3.types‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var a0: [any, any, any] = []; // Error
1414

1515
var a1: [boolean, string, number] = ["string", 1, true]; // Error
1616
>a1 : [boolean, string, number]
17-
>["string", 1, true] : ["string", number, boolean]
17+
>["string", 1, true] : [string, number, boolean]
1818
>"string" : "string"
1919
>1 : 1
2020
>true : true

‎tests/baselines/reference/assignToFn.types‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ module M {
1313
var x:I={ f:function(n) { return true; } };
1414
>x : I
1515
>I : I
16-
>{ f:function(n) { return true; } } : { f: (n: number) => true; }
17-
>f : (n: number) => true
18-
>function(n) { return true; } : (n: number) => true
16+
>{ f:function(n) { return true; } } : { f: (n: number) => boolean; }
17+
>f : (n: number) => boolean
18+
>function(n) { return true; } : (n: number) => boolean
1919
>n : number
2020
>true : true
2121

‎tests/baselines/reference/assignmentTypeNarrowing.types‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ x; // string
1212
>x : string
1313

1414
[x] = [true];
15-
>[x] = [true] : [true]
15+
>[x] = [true] : [boolean]
1616
>[x] : [string | number | boolean | RegExp]
1717
>x : string | number | boolean | RegExp
18-
>[true] : [true]
18+
>[true] : [boolean]
1919
>true : true
2020

2121
x; // boolean
22-
>x : true
22+
>x : boolean
2323

2424
[x = ""] = [1];
2525
>[x = ""] = [1] : [number]
@@ -34,41 +34,41 @@ x; // string | number
3434
>x : string | number
3535

3636
({x} = {x: true});
37-
>({x} = {x: true}) : { x: true; }
38-
>{x} = {x: true} : { x: true; }
37+
>({x} = {x: true}) : { x: boolean; }
38+
>{x} = {x: true} : { x: boolean; }
3939
>{x} : { x: string | number | boolean | RegExp; }
4040
>x : string | number | boolean | RegExp
41-
>{x: true} : { x: true; }
41+
>{x: true} : { x: boolean; }
4242
>x : boolean
4343
>true : true
4444

4545
x; // boolean
46-
>x : true
46+
>x : boolean
4747

4848
({y: x} = {y: 1});
49-
>({y: x} = {y: 1}) : { y: 1; }
50-
>{y: x} = {y: 1} : { y: 1; }
49+
>({y: x} = {y: 1}) : { y: number; }
50+
>{y: x} = {y: 1} : { y: number; }
5151
>{y: x} : { y: string | number | boolean | RegExp; }
5252
>y : string | number | boolean | RegExp
5353
>x : string | number | boolean | RegExp
54-
>{y: 1} : { y: 1; }
54+
>{y: 1} : { y: number; }
5555
>y : number
5656
>1 : 1
5757

5858
x; // number
5959
>x : number
6060

6161
({x = ""} = {x: true});
62-
>({x = ""} = {x: true}) : { x?: true; }
63-
>{x = ""} = {x: true} : { x?: true; }
62+
>({x = ""} = {x: true}) : { x?: boolean; }
63+
>{x = ""} = {x: true} : { x?: boolean; }
6464
>{x = ""} : { x?: string | number | boolean | RegExp; }
6565
>x : string | number | boolean | RegExp
66-
>{x: true} : { x?: true; }
66+
>{x: true} : { x?: boolean; }
6767
>x : boolean
6868
>true : true
6969

7070
x; // string | boolean
71-
>x : string | true
71+
>x : string | boolean
7272

7373
({y: x = /a/} = {y: 1});
7474
>({y: x = /a/} = {y: 1}) : { y?: number; }

‎tests/baselines/reference/asyncFunctionReturnType.types‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ async function fAsyncExplicit(): Promise<[number, boolean]> {
1515

1616
// This is contextually typed as a tuple.
1717
return [1, true];
18-
>[1, true] : [number, true]
18+
>[1, true] : [number, boolean]
1919
>1 : 1
2020
>true : true
2121
}

‎tests/baselines/reference/computedPropertyNamesContextualType10_ES5.errors.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES5.ts(5,5): error TS2322: Type '{ [x: number]: "" | 0; }' is not assignable to type 'I'.
1+
tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES5.ts(5,5): error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
22
Index signatures are incompatible.
3-
Type '"" | 0' is not assignable to type 'boolean'.
4-
Type '""' is not assignable to type 'boolean'.
3+
Type 'string | number' is not assignable to type 'boolean'.
4+
Type 'string' is not assignable to type 'boolean'.
55

66

77
==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES5.ts (1 errors) ====
@@ -11,10 +11,10 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualTy
1111

1212
var o: I = {
1313
~
14-
!!! error TS2322: Type '{ [x: number]: "" | 0; }' is not assignable to type 'I'.
14+
!!! error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
1515
!!! error TS2322: Index signatures are incompatible.
16-
!!! error TS2322: Type '"" | 0' is not assignable to type 'boolean'.
17-
!!! error TS2322: Type '""' is not assignable to type 'boolean'.
16+
!!! error TS2322: Type 'string | number' is not assignable to type 'boolean'.
17+
!!! error TS2322: Type 'string' is not assignable to type 'boolean'.
1818
[+"foo"]: "",
1919
[+"bar"]: 0
2020
}

‎tests/baselines/reference/computedPropertyNamesContextualType10_ES5.types‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ interface I {
99
var o: I = {
1010
>o : I
1111
>I : I
12-
>{ [+"foo"]: "", [+"bar"]: 0} : { [x: number]: "" | 0; }
12+
>{ [+"foo"]: "", [+"bar"]: 0} : { [x: number]: string | number; }
1313

1414
[+"foo"]: "",
1515
>+"foo" : number

‎tests/baselines/reference/computedPropertyNamesContextualType10_ES6.errors.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES6.ts(5,5): error TS2322: Type '{ [x: number]: "" | 0; }' is not assignable to type 'I'.
1+
tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES6.ts(5,5): error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
22
Index signatures are incompatible.
3-
Type '"" | 0' is not assignable to type 'boolean'.
4-
Type '""' is not assignable to type 'boolean'.
3+
Type 'string | number' is not assignable to type 'boolean'.
4+
Type 'string' is not assignable to type 'boolean'.
55

66

77
==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES6.ts (1 errors) ====
@@ -11,10 +11,10 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualTy
1111

1212
var o: I = {
1313
~
14-
!!! error TS2322: Type '{ [x: number]: "" | 0; }' is not assignable to type 'I'.
14+
!!! error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
1515
!!! error TS2322: Index signatures are incompatible.
16-
!!! error TS2322: Type '"" | 0' is not assignable to type 'boolean'.
17-
!!! error TS2322: Type '""' is not assignable to type 'boolean'.
16+
!!! error TS2322: Type 'string | number' is not assignable to type 'boolean'.
17+
!!! error TS2322: Type 'string' is not assignable to type 'boolean'.
1818
[+"foo"]: "",
1919
[+"bar"]: 0
2020
}

0 commit comments

Comments
 (0)