Skip to content

Commit 592319d

Browse files
ahejlsbergahejlsberg
committed
Accepting new baselines
1 parent 3cbc3db commit 592319d

File tree

105 files changed

+664
-662
lines changed

Some content is hidden

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

105 files changed

+664
-662
lines changed

‎tests/baselines/reference/ES5For-of30.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts(3,6): error TS2461: Type 'string | number' is not an array type.
1+
tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts(3,6): error TS2461: Type 'number | string' is not an array type.
22
tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts(3,7): error TS2322: Type 'number' is not assignable to type 'string'.
33
tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts(3,14): error TS2322: Type 'string' is not assignable to type 'number'.
44

@@ -8,7 +8,7 @@ tests/cases/conformance/statements/for-ofStatements/ES5For-of30.ts(3,14): error
88
var tuple: [number, string] = [2, "3"];
99
for ([a = 1, b = ""] of tuple) {
1010
~~~~~~~~~~~~~~~
11-
!!! error TS2461: Type 'string | number' is not an array type.
11+
!!! error TS2461: Type 'number | string' is not an array type.
1212
~
1313
!!! error TS2322: Type 'number' is not assignable to type 'string'.
1414
~

‎tests/baselines/reference/ES5For-ofTypeCheck11.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts(3,6): error TS2322: Type 'string | number' is not assignable to type 'string'.
1+
tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts(3,6): error TS2322: Type 'number | string' is not assignable to type 'string'.
22
Type 'number' is not assignable to type 'string'.
33

44

@@ -7,5 +7,5 @@ tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck11.ts(3,6)
77
var v: string;
88
for (v of union) { }
99
~
10-
!!! error TS2322: Type 'string | number' is not assignable to type 'string'.
10+
!!! error TS2322: Type 'number | string' is not assignable to type 'string'.
1111
!!! error TS2322: Type 'number' is not assignable to type 'string'.

‎tests/baselines/reference/ES5For-ofTypeCheck5.types

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ var union: string | number[];
33
>union : string | number[]
44

55
for (var v of union) { }
6-
>v : string | number
6+
>v : number | string
77
>union : string | number[]
88

‎tests/baselines/reference/ES5For-ofTypeCheck9.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts(2,15): error TS2461: Type 'number | symbol | string[]' is not an array type.
1+
tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts(2,15): error TS2461: Type 'string[] | number | symbol' is not an array type.
22

33

44
==== tests/cases/conformance/statements/for-ofStatements/ES5For-ofTypeCheck9.ts (1 errors) ====
55
var union: string | string[] | number | symbol;
66
for (let v of union) { }
77
~~~~~
8-
!!! error TS2461: Type 'number | symbol | string[]' is not an array type.
8+
!!! error TS2461: Type 'string[] | number | symbol' is not an array type.

‎tests/baselines/reference/TypeGuardWithEnumUnion.types

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ enum Color { R, G, B }
66
>B : Color
77

88
function f1(x: Color | string) {
9-
>f1 : (x: string | Color) => void
10-
>x : string | Color
9+
>f1 : (x: Color | string) => void
10+
>x : Color | string
1111
>Color : Color
1212

1313
if (typeof x === "number") {
1414
>typeof x === "number" : boolean
1515
>typeof x : string
16-
>x : string | Color
16+
>x : Color | string
1717
>"number" : string
1818

1919
var y = x;
@@ -35,14 +35,14 @@ function f1(x: Color | string) {
3535
}
3636

3737
function f2(x: Color | string | string[]) {
38-
>f2 : (x: string | Color | string[]) => void
39-
>x : string | Color | string[]
38+
>f2 : (x: Color | string | string[]) => void
39+
>x : Color | string | string[]
4040
>Color : Color
4141

4242
if (typeof x === "object") {
4343
>typeof x === "object" : boolean
4444
>typeof x : string
45-
>x : string | Color | string[]
45+
>x : Color | string | string[]
4646
>"object" : string
4747

4848
var y = x;
@@ -55,7 +55,7 @@ function f2(x: Color | string | string[]) {
5555
if (typeof x === "number") {
5656
>typeof x === "number" : boolean
5757
>typeof x : string
58-
>x : string | Color | string[]
58+
>x : Color | string | string[]
5959
>"number" : string
6060

6161
var z = x;
@@ -77,7 +77,7 @@ function f2(x: Color | string | string[]) {
7777
if (typeof x === "string") {
7878
>typeof x === "string" : boolean
7979
>typeof x : string
80-
>x : string | Color | string[]
80+
>x : Color | string | string[]
8181
>"string" : string
8282

8383
var a = x;

‎tests/baselines/reference/arrayBestCommonTypes.types

+6-6
Original file line numberDiff line numberDiff line change
@@ -769,22 +769,22 @@ module NonEmptyTypes {
769769
>base2 : typeof base2
770770

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

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

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

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/conformance/expressions/contextualTyping/arrayLiteralExpressionContextualTyping.ts(8,5): error TS2322: Type '[number, number, number, string]' is not assignable to type '[number, number, number]'.
22
Types of property 'pop' are incompatible.
3-
Type '() => string | number' is not assignable to type '() => number'.
4-
Type 'string | number' is not assignable to type 'number'.
3+
Type '() => number | string' is not assignable to type '() => number'.
4+
Type 'number | string' is not assignable to type 'number'.
55
Type 'string' is not assignable to type 'number'.
66
tests/cases/conformance/expressions/contextualTyping/arrayLiteralExpressionContextualTyping.ts(14,5): error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
77
Property '0' is missing in type 'number[]'.
@@ -19,8 +19,8 @@ tests/cases/conformance/expressions/contextualTyping/arrayLiteralExpressionConte
1919
~~~~
2020
!!! error TS2322: Type '[number, number, number, string]' is not assignable to type '[number, number, number]'.
2121
!!! error TS2322: Types of property 'pop' are incompatible.
22-
!!! error TS2322: Type '() => string | number' is not assignable to type '() => number'.
23-
!!! error TS2322: Type 'string | number' is not assignable to type 'number'.
22+
!!! error TS2322: Type '() => number | string' is not assignable to type '() => number'.
23+
!!! error TS2322: Type 'number | string' is not assignable to type 'number'.
2424
!!! error TS2322: Type 'string' is not assignable to type 'number'.
2525

2626
// In a contextually typed array literal expression containing one or more spread elements,

‎tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ var as = [a, b]; // { x: number; y?: number };[]
2323
>b : { x: number; z?: number; }
2424

2525
var bs = [b, a]; // { x: number; z?: number };[]
26-
>bs : ({ x: number; y?: number; } | { x: number; z?: number; })[]
27-
>[b, a] : ({ x: number; y?: number; } | { x: number; z?: number; })[]
26+
>bs : ({ x: number; z?: number; } | { x: number; y?: number; })[]
27+
>[b, a] : ({ x: number; z?: number; } | { x: number; y?: number; })[]
2828
>b : { x: number; z?: number; }
2929
>a : { x: number; y?: number; }
3030

‎tests/baselines/reference/arrayLiterals2ES5.types

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var a1 = ["hello", "world"]
2424
>"world" : string
2525

2626
var a2 = [, , , ...a0, "hello"];
27-
>a2 : (string | number)[]
28-
>[, , , ...a0, "hello"] : (string | number)[]
27+
>a2 : (number | string)[]
28+
>[, , , ...a0, "hello"] : (number | string)[]
2929
> : undefined
3030
> : undefined
3131
> : undefined
@@ -151,8 +151,8 @@ interface myArray2 extends Array<Number|String> { }
151151
>String : String
152152

153153
var d0 = [1, true, ...temp,]; // has type (string|number|boolean)[]
154-
>d0 : (string | number | boolean)[]
155-
>[1, true, ...temp,] : (string | number | boolean)[]
154+
>d0 : (number | boolean | string)[]
155+
>[1, true, ...temp,] : (number | boolean | string)[]
156156
>1 : number
157157
>true : boolean
158158
>...temp : string
@@ -214,8 +214,8 @@ var d8: number[][] = [[...temp1]]
214214
>temp1 : number[]
215215

216216
var d9 = [[...temp1], ...["hello"]];
217-
>d9 : (string | number[])[]
218-
>[[...temp1], ...["hello"]] : (string | number[])[]
217+
>d9 : (number[] | string)[]
218+
>[[...temp1], ...["hello"]] : (number[] | string)[]
219219
>[...temp1] : number[]
220220
>...temp1 : number
221221
>temp1 : number[]

‎tests/baselines/reference/arrayLiterals2ES6.types

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var a1 = ["hello", "world"]
2424
>"world" : string
2525

2626
var a2 = [, , , ...a0, "hello"];
27-
>a2 : (string | number)[]
28-
>[, , , ...a0, "hello"] : (string | number)[]
27+
>a2 : (number | string)[]
28+
>[, , , ...a0, "hello"] : (number | string)[]
2929
> : undefined
3030
> : undefined
3131
> : undefined
@@ -140,8 +140,8 @@ interface myArray2 extends Array<Number|String> { }
140140
>String : String
141141

142142
var d0 = [1, true, ...temp, ]; // has type (string|number|boolean)[]
143-
>d0 : (string | number | boolean)[]
144-
>[1, true, ...temp, ] : (string | number | boolean)[]
143+
>d0 : (number | boolean | string)[]
144+
>[1, true, ...temp, ] : (number | boolean | string)[]
145145
>1 : number
146146
>true : boolean
147147
>...temp : string
@@ -176,10 +176,10 @@ var d4: myArray2 = [...temp, ...temp1];
176176
>temp1 : number[]
177177

178178
var d5 = [...a2];
179-
>d5 : (string | number)[]
180-
>[...a2] : (string | number)[]
181-
>...a2 : string | number
182-
>a2 : (string | number)[]
179+
>d5 : (number | string)[]
180+
>[...a2] : (number | string)[]
181+
>...a2 : number | string
182+
>a2 : (number | string)[]
183183

184184
var d6 = [...a3];
185185
>d6 : number[]
@@ -201,8 +201,8 @@ var d8: number[][] = [[...temp1]]
201201
>temp1 : number[]
202202

203203
var d9 = [[...temp1], ...["hello"]];
204-
>d9 : (string | number[])[]
205-
>[[...temp1], ...["hello"]] : (string | number[])[]
204+
>d9 : (number[] | string)[]
205+
>[[...temp1], ...["hello"]] : (number[] | string)[]
206206
>[...temp1] : number[]
207207
>...temp1 : number
208208
>temp1 : number[]

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(11,5): error
55
Type 'string' is not assignable to type 'boolean'.
66
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(17,5): error TS2322: Type '[number, number, string, boolean]' is not assignable to type '[number, number]'.
77
Types of property 'pop' are incompatible.
8-
Type '() => string | number | boolean' is not assignable to type '() => number'.
9-
Type 'string | number | boolean' is not assignable to type 'number'.
8+
Type '() => number | string | boolean' is not assignable to type '() => number'.
9+
Type 'number | string | boolean' is not assignable to type 'number'.
1010
Type 'string' is not assignable to type 'number'.
1111
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(32,5): error TS2322: Type '(number[] | string[])[]' is not assignable to type 'tup'.
1212
Property '0' is missing in type '(number[] | string[])[]'.
1313
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(33,5): error TS2322: Type 'number[]' is not assignable to type '[number, number, number]'.
1414
Property '0' is missing in type 'number[]'.
15-
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error TS2322: Type '(string | number)[]' is not assignable to type 'myArray'.
15+
tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error TS2322: Type '(number | string)[]' is not assignable to type 'myArray'.
1616
Types of property 'push' are incompatible.
17-
Type '(...items: (string | number)[]) => number' is not assignable to type '(...items: Number[]) => number'.
17+
Type '(...items: (number | string)[]) => number' is not assignable to type '(...items: Number[]) => number'.
1818
Types of parameters 'items' and 'items' are incompatible.
19-
Type 'string | number' is not assignable to type 'Number'.
19+
Type 'number | string' is not assignable to type 'Number'.
2020
Type 'string' is not assignable to type 'Number'.
2121
Property 'toFixed' is missing in type 'String'.
2222

@@ -49,8 +49,8 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
4949
~~~~~~~~
5050
!!! error TS2322: Type '[number, number, string, boolean]' is not assignable to type '[number, number]'.
5151
!!! error TS2322: Types of property 'pop' are incompatible.
52-
!!! error TS2322: Type '() => string | number | boolean' is not assignable to type '() => number'.
53-
!!! error TS2322: Type 'string | number | boolean' is not assignable to type 'number'.
52+
!!! error TS2322: Type '() => number | string | boolean' is not assignable to type '() => number'.
53+
!!! error TS2322: Type 'number | string | boolean' is not assignable to type 'number'.
5454
!!! error TS2322: Type 'string' is not assignable to type 'number'.
5555

5656
// The resulting type an array literal expression is determined as follows:
@@ -76,11 +76,11 @@ tests/cases/conformance/expressions/arrayLiterals/arrayLiterals3.ts(34,5): error
7676
!!! error TS2322: Property '0' is missing in type 'number[]'.
7777
var c2: myArray = [...temp1, ...temp]; // Error cannot assign (number|string)[] to number[]
7878
~~
79-
!!! error TS2322: Type '(string | number)[]' is not assignable to type 'myArray'.
79+
!!! error TS2322: Type '(number | string)[]' is not assignable to type 'myArray'.
8080
!!! error TS2322: Types of property 'push' are incompatible.
81-
!!! error TS2322: Type '(...items: (string | number)[]) => number' is not assignable to type '(...items: Number[]) => number'.
81+
!!! error TS2322: Type '(...items: (number | string)[]) => number' is not assignable to type '(...items: Number[]) => number'.
8282
!!! error TS2322: Types of parameters 'items' and 'items' are incompatible.
83-
!!! error TS2322: Type 'string | number' is not assignable to type 'Number'.
83+
!!! error TS2322: Type 'number | string' is not assignable to type 'Number'.
8484
!!! error TS2322: Type 'string' is not assignable to type 'Number'.
8585
!!! error TS2322: Property 'toFixed' is missing in type 'String'.
8686

‎tests/baselines/reference/asOperator1.types

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ var z = Date as any as string;
2424

2525
// Should parse as a union type, not a bitwise 'or' of (32 as number) and 'string'
2626
var j = 32 as number|string;
27-
>j : string | number
28-
>32 as number|string : string | number
27+
>j : number | string
28+
>32 as number|string : number | string
2929
>32 : number
3030

3131
j = '';
3232
>j = '' : string
33-
>j : string | number
33+
>j : number | string
3434
>'' : string
3535

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(17,1): error TS2322: Type '[number, string]' is not assignable to type 'number[]'.
22
Types of property 'pop' are incompatible.
3-
Type '() => string | number' is not assignable to type '() => number'.
4-
Type 'string | number' is not assignable to type 'number'.
3+
Type '() => number | string' is not assignable to type '() => number'.
4+
Type 'number | string' is not assignable to type 'number'.
55
Type 'string' is not assignable to type 'number'.
66
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatBetweenTupleAndArray.ts(18,1): error TS2322: Type '{}[]' is not assignable to type '[{}]'.
77
Property '0' is missing in type '{}[]'.
@@ -28,8 +28,8 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
2828
~~~~~~~~
2929
!!! error TS2322: Type '[number, string]' is not assignable to type 'number[]'.
3030
!!! error TS2322: Types of property 'pop' are incompatible.
31-
!!! error TS2322: Type '() => string | number' is not assignable to type '() => number'.
32-
!!! error TS2322: Type 'string | number' is not assignable to type 'number'.
31+
!!! error TS2322: Type '() => number | string' is not assignable to type '() => number'.
32+
!!! error TS2322: Type 'number | string' is not assignable to type 'number'.
3333
!!! error TS2322: Type 'string' is not assignable to type 'number'.
3434
emptyObjTuple = emptyObjArray;
3535
~~~~~~~~~~~~~

‎tests/baselines/reference/awaitUnion_es6.types

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
=== tests/cases/conformance/async/es6/awaitUnion_es6.ts ===
22
declare let a: number | string;
3-
>a : string | number
3+
>a : number | string
44

55
declare let b: PromiseLike<number> | PromiseLike<string>;
66
>b : PromiseLike<number> | PromiseLike<string>
77
>PromiseLike : PromiseLike<T>
88
>PromiseLike : PromiseLike<T>
99

1010
declare let c: PromiseLike<number | string>;
11-
>c : PromiseLike<string | number>
11+
>c : PromiseLike<number | string>
1212
>PromiseLike : PromiseLike<T>
1313

1414
declare let d: number | PromiseLike<string>;
1515
>d : number | PromiseLike<string>
1616
>PromiseLike : PromiseLike<T>
1717

1818
declare let e: number | PromiseLike<number | string>;
19-
>e : number | PromiseLike<string | number>
19+
>e : number | PromiseLike<number | string>
2020
>PromiseLike : PromiseLike<T>
2121

2222
async function f() {
2323
>f : () => Promise<void>
2424

2525
let await_a = await a;
26-
>await_a : string | number
26+
>await_a : number | string
2727
>a : any
2828

2929
let await_b = await b;
30-
>await_b : string | number
30+
>await_b : number | string
3131
>b : any
3232

3333
let await_c = await c;
34-
>await_c : string | number
34+
>await_c : number | string
3535
>c : any
3636

3737
let await_d = await d;
38-
>await_d : string | number
38+
>await_d : number | string
3939
>d : any
4040

4141
let await_e = await e;
42-
>await_e : string | number
42+
>await_e : number | string
4343
>e : any
4444
}

‎tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ var r4 = true ? a : b; // typeof a
6060
>b : { x: number; z?: number; }
6161

6262
var r5 = true ? b : a; // typeof b
63-
>r5 : { x: number; y?: number; } | { x: number; z?: number; }
64-
>true ? b : a : { x: number; y?: number; } | { x: number; z?: number; }
63+
>r5 : { x: number; z?: number; } | { x: number; y?: number; }
64+
>true ? b : a : { x: number; z?: number; } | { x: number; y?: number; }
6565
>true : boolean
6666
>b : { x: number; z?: number; }
6767
>a : { x: number; y?: number; }

0 commit comments

Comments
 (0)