Skip to content

Commit 121c54a

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent 25a8ec3 commit 121c54a

File tree

136 files changed

+476
-475
lines changed

Some content is hidden

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

136 files changed

+476
-475
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(16,5): error TS2345: Argument of type '(string | number | boolean)[]' is not assignable to parameter of type '[string, number, boolean]'.
22
Target requires 3 element(s) but source may have fewer.
3-
tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(17,5): error TS2345: Argument of type '[string, number, true, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
3+
tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(17,5): error TS2345: Argument of type '[string, number, boolean, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
44
Target allows only 3 element(s) but source may have more.
55
tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextualTyping.ts(18,5): error TS2345: Argument of type '{ x: (string | number)[]; y: { c: boolean; d: string; e: number; }; }' is not assignable to parameter of type '{ x: [any, any]; y: { c: any; d: any; e: any; }; }'.
66
Types of property 'x' are incompatible.
@@ -30,7 +30,7 @@ tests/cases/conformance/expressions/contextualTyping/argumentExpressionContextua
3030
!!! error TS2345: Target requires 3 element(s) but source may have fewer.
3131
baz(["string", 1, true, ...array]); // Error
3232
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33-
!!! error TS2345: Argument of type '[string, number, true, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
33+
!!! error TS2345: Argument of type '[string, number, boolean, ...(string | number | boolean)[]]' is not assignable to parameter of type '[string, number, boolean]'.
3434
!!! error TS2345: Target allows only 3 element(s) but source may have more.
3535
foo(o); // Error because x has an array type namely (string|number)[]
3636
~

‎tests/baselines/reference/argumentExpressionContextualTyping.types

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ 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; }
61-
>c : true
59+
>y : { c: boolean; d: string; e: number; }
60+
>{ c: true, d: "world", e: 3 } : { c: boolean; d: string; e: number; }
61+
>c : boolean
6262
>true : true
6363
>d : string
6464
>"world" : "world"
@@ -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
@@ -122,7 +122,7 @@ baz(array); // Error
122122
baz(["string", 1, true, ...array]); // Error
123123
>baz(["string", 1, true, ...array]) : void
124124
>baz : (x: [string, number, boolean]) => void
125-
>["string", 1, true, ...array] : [string, number, true, ...(string | number | boolean)[]]
125+
>["string", 1, true, ...array] : [string, number, boolean, ...(string | number | boolean)[]]
126126
>"string" : "string"
127127
>1 : 1
128128
>true : true

‎tests/baselines/reference/arrayBestCommonTypes.types

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,15 @@ module EmptyTypes {
249249
>t2 : { x: boolean; y: base; }[]
250250
>x : boolean
251251
>y : base
252-
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
253-
>{ x: true, y: new derived() } : { x: true; y: derived; }
254-
>x : true
252+
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : { x: boolean; y: derived; }[]
253+
>{ x: true, y: new derived() } : { x: boolean; y: derived; }
254+
>x : boolean
255255
>true : true
256256
>y : derived
257257
>new derived() : derived
258258
>derived : typeof derived
259-
>{ x: false, y: new base() } : { x: false; y: base; }
260-
>x : false
259+
>{ x: false, y: new base() } : { x: boolean; y: base; }
260+
>x : boolean
261261
>false : false
262262
>y : base
263263
>new base() : base
@@ -645,15 +645,15 @@ module NonEmptyTypes {
645645
>t2 : { x: boolean; y: base; }[]
646646
>x : boolean
647647
>y : base
648-
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : ({ x: true; y: derived; } | { x: false; y: base; })[]
649-
>{ x: true, y: new derived() } : { x: true; y: derived; }
650-
>x : true
648+
>[{ x: true, y: new derived() }, { x: false, y: new base() }] : { x: boolean; y: base; }[]
649+
>{ x: true, y: new derived() } : { x: boolean; y: derived; }
650+
>x : boolean
651651
>true : true
652652
>y : derived
653653
>new derived() : derived
654654
>derived : typeof derived
655-
>{ x: false, y: new base() } : { x: false; y: base; }
656-
>x : false
655+
>{ x: false, y: new base() } : { x: boolean; y: base; }
656+
>x : boolean
657657
>false : false
658658
>y : base
659659
>new base() : base

‎tests/baselines/reference/arrayLiteralInference.types

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,21 @@ declare function foo<T>(...args: T[]): T[];
119119
let b1: { x: boolean }[] = foo({ x: true }, { x: false });
120120
>b1 : { x: boolean; }[]
121121
>x : boolean
122-
>foo({ x: true }, { x: false }) : ({ x: true; } | { x: false; })[]
122+
>foo({ x: true }, { x: false }) : { x: boolean; }[]
123123
>foo : <T>(...args: T[]) => T[]
124-
>{ x: true } : { x: true; }
125-
>x : true
124+
>{ x: true } : { x: boolean; }
125+
>x : boolean
126126
>true : true
127-
>{ x: false } : { x: false; }
128-
>x : false
127+
>{ x: false } : { x: boolean; }
128+
>x : boolean
129129
>false : false
130130

131131
let b2: boolean[][] = foo([true], [false]);
132132
>b2 : boolean[][]
133-
>foo([true], [false]) : (true[] | false[])[]
133+
>foo([true], [false]) : boolean[][]
134134
>foo : <T>(...args: T[]) => T[]
135-
>[true] : true[]
135+
>[true] : boolean[]
136136
>true : true
137-
>[false] : false[]
137+
>[false] : boolean[]
138138
>false : false
139139

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
tests/cases/compiler/arrayLiteralTypeInference.ts(14,14): error TS2322: Type '{ id: number; trueness: false; }' is not assignable to type 'Action'.
1+
tests/cases/compiler/arrayLiteralTypeInference.ts(14,14): error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type 'Action'.
22
Object literal may only specify known properties, and 'trueness' does not exist in type 'Action'.
33
tests/cases/compiler/arrayLiteralTypeInference.ts(15,14): error TS2322: Type '{ id: number; name: string; }' is not assignable to type 'Action'.
44
Object literal may only specify known properties, and 'name' does not exist in type 'Action'.
5-
tests/cases/compiler/arrayLiteralTypeInference.ts(31,18): error TS2322: Type '{ id: number; trueness: false; }' is not assignable to type '{ id: number; }'.
5+
tests/cases/compiler/arrayLiteralTypeInference.ts(31,18): error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type '{ id: number; }'.
66
Object literal may only specify known properties, and 'trueness' does not exist in type '{ id: number; }'.
77
tests/cases/compiler/arrayLiteralTypeInference.ts(32,18): error TS2322: Type '{ id: number; name: string; }' is not assignable to type '{ id: number; }'.
88
Object literal may only specify known properties, and 'name' does not exist in type '{ id: number; }'.
@@ -24,7 +24,7 @@ tests/cases/compiler/arrayLiteralTypeInference.ts(32,18): error TS2322: Type '{
2424
var x1: Action[] = [
2525
{ id: 2, trueness: false },
2626
~~~~~~~~~~~~~~~
27-
!!! error TS2322: Type '{ id: number; trueness: false; }' is not assignable to type 'Action'.
27+
!!! error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type 'Action'.
2828
!!! error TS2322: Object literal may only specify known properties, and 'trueness' does not exist in type 'Action'.
2929
{ id: 3, name: "three" }
3030
~~~~~~~~~~~~~
@@ -47,7 +47,7 @@ tests/cases/compiler/arrayLiteralTypeInference.ts(32,18): error TS2322: Type '{
4747
[
4848
{ id: 2, trueness: false },
4949
~~~~~~~~~~~~~~~
50-
!!! error TS2322: Type '{ id: number; trueness: false; }' is not assignable to type '{ id: number; }'.
50+
!!! error TS2322: Type '{ id: number; trueness: boolean; }' is not assignable to type '{ id: number; }'.
5151
!!! error TS2322: Object literal may only specify known properties, and 'trueness' does not exist in type '{ id: number; }'.
5252
{ id: 3, name: "three" }
5353
~~~~~~~~~~~~~

‎tests/baselines/reference/assignToFn.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ module M {
1010

1111
var x:I={ f:function(n) { return true; } };
1212
>x : I
13-
>{ f:function(n) { return true; } } : { f: (n: number) => true; }
14-
>f : (n: number) => true
15-
>function(n) { return true; } : (n: number) => true
13+
>{ f:function(n) { return true; } } : { f: (n: number) => boolean; }
14+
>f : (n: number) => boolean
15+
>function(n) { return true; } : (n: number) => boolean
1616
>n : number
1717
>true : true
1818

‎tests/baselines/reference/assignmentTypeNarrowing.types

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

1313
[x] = [true];
14-
>[x] = [true] : [true]
14+
>[x] = [true] : [boolean]
1515
>[x] : [string | number | boolean | RegExp]
1616
>x : string | number | boolean | RegExp
17-
>[true] : [true]
17+
>[true] : [boolean]
1818
>true : true
1919

2020
x; // boolean
21-
>x : true
21+
>x : boolean
2222

2323
[x = ""] = [1];
2424
>[x = ""] = [1] : [number]
@@ -33,16 +33,16 @@ x; // string | number
3333
>x : string | number
3434

3535
({x} = {x: true});
36-
>({x} = {x: true}) : { x: true; }
37-
>{x} = {x: true} : { x: true; }
36+
>({x} = {x: true}) : { x: boolean; }
37+
>{x} = {x: true} : { x: boolean; }
3838
>{x} : { x: string | number | boolean | RegExp; }
3939
>x : string | number | boolean | RegExp
40-
>{x: true} : { x: true; }
41-
>x : true
40+
>{x: true} : { x: boolean; }
41+
>x : boolean
4242
>true : true
4343

4444
x; // boolean
45-
>x : true
45+
>x : boolean
4646

4747
({y: x} = {y: 1});
4848
>({y: x} = {y: 1}) : { y: number; }
@@ -58,17 +58,17 @@ x; // number
5858
>x : number
5959

6060
({x = ""} = {x: true});
61-
>({x = ""} = {x: true}) : { x?: true; }
62-
>{x = ""} = {x: true} : { x?: true; }
61+
>({x = ""} = {x: true}) : { x?: boolean; }
62+
>{x = ""} = {x: true} : { x?: boolean; }
6363
>{x = ""} : { x?: string | number | boolean | RegExp; }
6464
>x : string | number | boolean | RegExp
6565
>"" : ""
66-
>{x: true} : { x?: true; }
67-
>x : true
66+
>{x: true} : { x?: boolean; }
67+
>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
@@ -14,7 +14,7 @@ async function fAsyncExplicit(): Promise<[number, boolean]> {
1414

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

‎tests/baselines/reference/awaitedType.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ async function main() {
116116
>Promise.all : { <T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; <T extends [] | readonly unknown[]>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; }
117117
>Promise : PromiseConstructor
118118
>all : { <T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; <T extends [] | readonly unknown[]>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; }
119-
>[ MaybePromise(1), MaybePromise('2'), MaybePromise(true), ] : [number | Promise<1> | PromiseLike<1>, string | Promise<"2"> | PromiseLike<"2">, MaybePromise<true>]
119+
>[ MaybePromise(1), MaybePromise('2'), MaybePromise(true), ] : [number | Promise<1> | PromiseLike<1>, string | Promise<"2"> | PromiseLike<"2">, boolean | Promise<true> | PromiseLike<true>]
120120

121121
MaybePromise(1),
122122
>MaybePromise(1) : 1 | Promise<1> | PromiseLike<1>

‎tests/baselines/reference/awaitedTypeStrictNull.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ async function main() {
116116
>Promise.all : { <T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; <T extends [] | readonly unknown[]>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; }
117117
>Promise : PromiseConstructor
118118
>all : { <T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>[]>; <T extends [] | readonly unknown[]>(values: T): Promise<{ -readonly [P in keyof T]: Awaited<T[P]>; }>; }
119-
>[ MaybePromise(1), MaybePromise('2'), MaybePromise(true), ] : [number | Promise<1> | PromiseLike<1>, string | Promise<"2"> | PromiseLike<"2">, MaybePromise<true>]
119+
>[ MaybePromise(1), MaybePromise('2'), MaybePromise(true), ] : [number | Promise<1> | PromiseLike<1>, string | Promise<"2"> | PromiseLike<"2">, boolean | Promise<true> | PromiseLike<true>]
120120

121121
MaybePromise(1),
122122
>MaybePromise(1) : 1 | Promise<1> | PromiseLike<1>

0 commit comments

Comments
 (0)