Skip to content

Commit 81bfa6f

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent 2f0ac25 commit 81bfa6f

30 files changed

+139
-154
lines changed

‎tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2351,7 +2351,7 @@ declare namespace ts {
23512351
*/
23522352
export interface TypeReference extends ObjectType {
23532353
target: GenericType;
2354-
node?: ArrayTypeNode | TupleTypeNode;
2354+
node?: TypeReferenceNode | ArrayTypeNode | TupleTypeNode;
23552355
}
23562356
export interface DeferredTypeReference extends TypeReference {
23572357
}

‎tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2351,7 +2351,7 @@ declare namespace ts {
23512351
*/
23522352
export interface TypeReference extends ObjectType {
23532353
target: GenericType;
2354-
node?: ArrayTypeNode | TupleTypeNode;
2354+
node?: TypeReferenceNode | ArrayTypeNode | TupleTypeNode;
23552355
}
23562356
export interface DeferredTypeReference extends TypeReference {
23572357
}

‎tests/baselines/reference/asyncAliasReturnType_es5.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/async/es5/asyncAliasReturnType_es5.ts ===
22
type PromiseAlias<T> = Promise<T>;
3-
>PromiseAlias : Promise<T>
3+
>PromiseAlias : PromiseAlias<T>
44

55
async function f(): PromiseAlias<void> {
6-
>f : () => Promise<void>
6+
>f : () => PromiseAlias<void>
77
}

‎tests/baselines/reference/asyncAliasReturnType_es6.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/async/es6/asyncAliasReturnType_es6.ts ===
22
type PromiseAlias<T> = Promise<T>;
3-
>PromiseAlias : Promise<T>
3+
>PromiseAlias : PromiseAlias<T>
44

55
async function f(): PromiseAlias<void> {
6-
>f : () => Promise<void>
6+
>f : () => PromiseAlias<void>
77
}

‎tests/baselines/reference/asyncAwait_es2017.types

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
=== tests/cases/conformance/async/es2017/asyncAwait_es2017.ts ===
22
type MyPromise<T> = Promise<T>;
3-
>MyPromise : Promise<T>
3+
>MyPromise : MyPromise<T>
44

55
declare var MyPromise: typeof Promise;
66
>MyPromise : PromiseConstructor
@@ -10,7 +10,7 @@ declare var p: Promise<number>;
1010
>p : Promise<number>
1111

1212
declare var mp: MyPromise<number>;
13-
>mp : Promise<number>
13+
>mp : MyPromise<number>
1414

1515
async function f0() { }
1616
>f0 : () => Promise<void>
@@ -19,7 +19,7 @@ async function f1(): Promise<void> { }
1919
>f1 : () => Promise<void>
2020

2121
async function f3(): MyPromise<void> { }
22-
>f3 : () => Promise<void>
22+
>f3 : () => MyPromise<void>
2323

2424
let f4 = async function() { }
2525
>f4 : () => Promise<void>
@@ -30,8 +30,8 @@ let f5 = async function(): Promise<void> { }
3030
>async function(): Promise<void> { } : () => Promise<void>
3131

3232
let f6 = async function(): MyPromise<void> { }
33-
>f6 : () => Promise<void>
34-
>async function(): MyPromise<void> { } : () => Promise<void>
33+
>f6 : () => MyPromise<void>
34+
>async function(): MyPromise<void> { } : () => MyPromise<void>
3535

3636
let f7 = async () => { };
3737
>f7 : () => Promise<void>
@@ -42,8 +42,8 @@ let f8 = async (): Promise<void> => { };
4242
>async (): Promise<void> => { } : () => Promise<void>
4343

4444
let f9 = async (): MyPromise<void> => { };
45-
>f9 : () => Promise<void>
46-
>async (): MyPromise<void> => { } : () => Promise<void>
45+
>f9 : () => MyPromise<void>
46+
>async (): MyPromise<void> => { } : () => MyPromise<void>
4747

4848
let f10 = async () => p;
4949
>f10 : () => Promise<number>
@@ -53,21 +53,21 @@ let f10 = async () => p;
5353
let f11 = async () => mp;
5454
>f11 : () => Promise<number>
5555
>async () => mp : () => Promise<number>
56-
>mp : Promise<number>
56+
>mp : MyPromise<number>
5757

5858
let f12 = async (): Promise<number> => mp;
5959
>f12 : () => Promise<number>
6060
>async (): Promise<number> => mp : () => Promise<number>
61-
>mp : Promise<number>
61+
>mp : MyPromise<number>
6262

6363
let f13 = async (): MyPromise<number> => p;
64-
>f13 : () => Promise<number>
65-
>async (): MyPromise<number> => p : () => Promise<number>
64+
>f13 : () => MyPromise<number>
65+
>async (): MyPromise<number> => p : () => MyPromise<number>
6666
>p : Promise<number>
6767

6868
let o = {
69-
>o : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
70-
>{ async m1() { }, async m2(): Promise<void> { }, async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
69+
>o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
70+
>{ async m1() { }, async m2(): Promise<void> { }, async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
7171

7272
async m1() { },
7373
>m1 : () => Promise<void>
@@ -76,7 +76,7 @@ let o = {
7676
>m2 : () => Promise<void>
7777

7878
async m3(): MyPromise<void> { }
79-
>m3 : () => Promise<void>
79+
>m3 : () => MyPromise<void>
8080

8181
};
8282

@@ -90,7 +90,7 @@ class C {
9090
>m2 : () => Promise<void>
9191

9292
async m3(): MyPromise<void> { }
93-
>m3 : () => Promise<void>
93+
>m3 : () => MyPromise<void>
9494

9595
static async m4() { }
9696
>m4 : () => Promise<void>
@@ -99,7 +99,7 @@ class C {
9999
>m5 : () => Promise<void>
100100

101101
static async m6(): MyPromise<void> { }
102-
>m6 : () => Promise<void>
102+
>m6 : () => MyPromise<void>
103103
}
104104

105105
module M {

‎tests/baselines/reference/asyncAwait_es5.types

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
=== tests/cases/conformance/async/es5/asyncAwait_es5.ts ===
22
type MyPromise<T> = Promise<T>;
3-
>MyPromise : Promise<T>
3+
>MyPromise : MyPromise<T>
44

55
declare var MyPromise: typeof Promise;
66
>MyPromise : PromiseConstructor
@@ -10,7 +10,7 @@ declare var p: Promise<number>;
1010
>p : Promise<number>
1111

1212
declare var mp: MyPromise<number>;
13-
>mp : Promise<number>
13+
>mp : MyPromise<number>
1414

1515
async function f0() { }
1616
>f0 : () => Promise<void>
@@ -19,7 +19,7 @@ async function f1(): Promise<void> { }
1919
>f1 : () => Promise<void>
2020

2121
async function f3(): MyPromise<void> { }
22-
>f3 : () => Promise<void>
22+
>f3 : () => MyPromise<void>
2323

2424
let f4 = async function() { }
2525
>f4 : () => Promise<void>
@@ -30,8 +30,8 @@ let f5 = async function(): Promise<void> { }
3030
>async function(): Promise<void> { } : () => Promise<void>
3131

3232
let f6 = async function(): MyPromise<void> { }
33-
>f6 : () => Promise<void>
34-
>async function(): MyPromise<void> { } : () => Promise<void>
33+
>f6 : () => MyPromise<void>
34+
>async function(): MyPromise<void> { } : () => MyPromise<void>
3535

3636
let f7 = async () => { };
3737
>f7 : () => Promise<void>
@@ -42,8 +42,8 @@ let f8 = async (): Promise<void> => { };
4242
>async (): Promise<void> => { } : () => Promise<void>
4343

4444
let f9 = async (): MyPromise<void> => { };
45-
>f9 : () => Promise<void>
46-
>async (): MyPromise<void> => { } : () => Promise<void>
45+
>f9 : () => MyPromise<void>
46+
>async (): MyPromise<void> => { } : () => MyPromise<void>
4747

4848
let f10 = async () => p;
4949
>f10 : () => Promise<number>
@@ -53,21 +53,21 @@ let f10 = async () => p;
5353
let f11 = async () => mp;
5454
>f11 : () => Promise<number>
5555
>async () => mp : () => Promise<number>
56-
>mp : Promise<number>
56+
>mp : MyPromise<number>
5757

5858
let f12 = async (): Promise<number> => mp;
5959
>f12 : () => Promise<number>
6060
>async (): Promise<number> => mp : () => Promise<number>
61-
>mp : Promise<number>
61+
>mp : MyPromise<number>
6262

6363
let f13 = async (): MyPromise<number> => p;
64-
>f13 : () => Promise<number>
65-
>async (): MyPromise<number> => p : () => Promise<number>
64+
>f13 : () => MyPromise<number>
65+
>async (): MyPromise<number> => p : () => MyPromise<number>
6666
>p : Promise<number>
6767

6868
let o = {
69-
>o : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
70-
>{ async m1() { }, async m2(): Promise<void> { }, async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
69+
>o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
70+
>{ async m1() { }, async m2(): Promise<void> { }, async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
7171

7272
async m1() { },
7373
>m1 : () => Promise<void>
@@ -76,7 +76,7 @@ let o = {
7676
>m2 : () => Promise<void>
7777

7878
async m3(): MyPromise<void> { }
79-
>m3 : () => Promise<void>
79+
>m3 : () => MyPromise<void>
8080

8181
};
8282

@@ -90,7 +90,7 @@ class C {
9090
>m2 : () => Promise<void>
9191

9292
async m3(): MyPromise<void> { }
93-
>m3 : () => Promise<void>
93+
>m3 : () => MyPromise<void>
9494

9595
static async m4() { }
9696
>m4 : () => Promise<void>
@@ -99,7 +99,7 @@ class C {
9999
>m5 : () => Promise<void>
100100

101101
static async m6(): MyPromise<void> { }
102-
>m6 : () => Promise<void>
102+
>m6 : () => MyPromise<void>
103103
}
104104

105105
module M {

‎tests/baselines/reference/asyncAwait_es6.types

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
=== tests/cases/conformance/async/es6/asyncAwait_es6.ts ===
22
type MyPromise<T> = Promise<T>;
3-
>MyPromise : Promise<T>
3+
>MyPromise : MyPromise<T>
44

55
declare var MyPromise: typeof Promise;
66
>MyPromise : PromiseConstructor
@@ -10,7 +10,7 @@ declare var p: Promise<number>;
1010
>p : Promise<number>
1111

1212
declare var mp: MyPromise<number>;
13-
>mp : Promise<number>
13+
>mp : MyPromise<number>
1414

1515
async function f0() { }
1616
>f0 : () => Promise<void>
@@ -19,7 +19,7 @@ async function f1(): Promise<void> { }
1919
>f1 : () => Promise<void>
2020

2121
async function f3(): MyPromise<void> { }
22-
>f3 : () => Promise<void>
22+
>f3 : () => MyPromise<void>
2323

2424
let f4 = async function() { }
2525
>f4 : () => Promise<void>
@@ -30,8 +30,8 @@ let f5 = async function(): Promise<void> { }
3030
>async function(): Promise<void> { } : () => Promise<void>
3131

3232
let f6 = async function(): MyPromise<void> { }
33-
>f6 : () => Promise<void>
34-
>async function(): MyPromise<void> { } : () => Promise<void>
33+
>f6 : () => MyPromise<void>
34+
>async function(): MyPromise<void> { } : () => MyPromise<void>
3535

3636
let f7 = async () => { };
3737
>f7 : () => Promise<void>
@@ -42,8 +42,8 @@ let f8 = async (): Promise<void> => { };
4242
>async (): Promise<void> => { } : () => Promise<void>
4343

4444
let f9 = async (): MyPromise<void> => { };
45-
>f9 : () => Promise<void>
46-
>async (): MyPromise<void> => { } : () => Promise<void>
45+
>f9 : () => MyPromise<void>
46+
>async (): MyPromise<void> => { } : () => MyPromise<void>
4747

4848
let f10 = async () => p;
4949
>f10 : () => Promise<number>
@@ -53,21 +53,21 @@ let f10 = async () => p;
5353
let f11 = async () => mp;
5454
>f11 : () => Promise<number>
5555
>async () => mp : () => Promise<number>
56-
>mp : Promise<number>
56+
>mp : MyPromise<number>
5757

5858
let f12 = async (): Promise<number> => mp;
5959
>f12 : () => Promise<number>
6060
>async (): Promise<number> => mp : () => Promise<number>
61-
>mp : Promise<number>
61+
>mp : MyPromise<number>
6262

6363
let f13 = async (): MyPromise<number> => p;
64-
>f13 : () => Promise<number>
65-
>async (): MyPromise<number> => p : () => Promise<number>
64+
>f13 : () => MyPromise<number>
65+
>async (): MyPromise<number> => p : () => MyPromise<number>
6666
>p : Promise<number>
6767

6868
let o = {
69-
>o : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
70-
>{ async m1() { }, async m2(): Promise<void> { }, async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): Promise<void>; }
69+
>o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
70+
>{ async m1() { }, async m2(): Promise<void> { }, async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
7171

7272
async m1() { },
7373
>m1 : () => Promise<void>
@@ -76,7 +76,7 @@ let o = {
7676
>m2 : () => Promise<void>
7777

7878
async m3(): MyPromise<void> { }
79-
>m3 : () => Promise<void>
79+
>m3 : () => MyPromise<void>
8080

8181
};
8282

@@ -90,7 +90,7 @@ class C {
9090
>m2 : () => Promise<void>
9191

9292
async m3(): MyPromise<void> { }
93-
>m3 : () => Promise<void>
93+
>m3 : () => MyPromise<void>
9494

9595
static async m4() { }
9696
>m4 : () => Promise<void>
@@ -99,7 +99,7 @@ class C {
9999
>m5 : () => Promise<void>
100100

101101
static async m6(): MyPromise<void> { }
102-
>m6 : () => Promise<void>
102+
>m6 : () => MyPromise<void>
103103
}
104104

105105
module M {

‎tests/baselines/reference/complicatedIndexesOfIntersectionsAreInferencable.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ interface FormikConfig<Values> {
1212
}
1313

1414
declare function Func<Values = object, ExtraProps = {}>(
15-
>Func : <Values = object, ExtraProps = {}>(x: string extends "validate" | "initialValues" | keyof ExtraProps ? Readonly<FormikConfig<Values> & ExtraProps> : Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validate" | "initialValues" | Exclude<keyof ExtraProps, "validateOnChange">> & Partial<Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validateOnChange" | Extract<keyof ExtraProps, "validateOnChange">>>) => void
15+
>Func : <Values = object, ExtraProps = {}>(x: string extends keyof ExtraProps | "validate" | "initialValues" ? Readonly<FormikConfig<Values> & ExtraProps> : Pick<Readonly<FormikConfig<Values> & ExtraProps>, Exclude<keyof ExtraProps, "validateOnChange"> | "validate" | "initialValues"> & Partial<Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validateOnChange" | Extract<keyof ExtraProps, "validateOnChange">>>) => void
1616

1717
x: (string extends "validate" | "initialValues" | keyof ExtraProps
18-
>x : string extends "validate" | "initialValues" | keyof ExtraProps ? Readonly<FormikConfig<Values> & ExtraProps> : Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validate" | "initialValues" | Exclude<keyof ExtraProps, "validateOnChange">> & Partial<Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validateOnChange" | Extract<keyof ExtraProps, "validateOnChange">>>
18+
>x : string extends keyof ExtraProps | "validate" | "initialValues" ? Readonly<FormikConfig<Values> & ExtraProps> : Pick<Readonly<FormikConfig<Values> & ExtraProps>, Exclude<keyof ExtraProps, "validateOnChange"> | "validate" | "initialValues"> & Partial<Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validateOnChange" | Extract<keyof ExtraProps, "validateOnChange">>>
1919

2020
? Readonly<FormikConfig<Values> & ExtraProps>
2121
: Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validate" | "initialValues" | Exclude<keyof ExtraProps, "validateOnChange">>
@@ -24,7 +24,7 @@ declare function Func<Values = object, ExtraProps = {}>(
2424

2525
Func({
2626
>Func({ initialValues: { foo: "" }, validate: props => { props.foo; }}) : void
27-
>Func : <Values = object, ExtraProps = {}>(x: string extends "validate" | "initialValues" | keyof ExtraProps ? Readonly<FormikConfig<Values> & ExtraProps> : Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validate" | "initialValues" | Exclude<keyof ExtraProps, "validateOnChange">> & Partial<Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validateOnChange" | Extract<keyof ExtraProps, "validateOnChange">>>) => void
27+
>Func : <Values = object, ExtraProps = {}>(x: string extends keyof ExtraProps | "validate" | "initialValues" ? Readonly<FormikConfig<Values> & ExtraProps> : Pick<Readonly<FormikConfig<Values> & ExtraProps>, Exclude<keyof ExtraProps, "validateOnChange"> | "validate" | "initialValues"> & Partial<Pick<Readonly<FormikConfig<Values> & ExtraProps>, "validateOnChange" | Extract<keyof ExtraProps, "validateOnChange">>>) => void
2828
>{ initialValues: { foo: "" }, validate: props => { props.foo; }} : { initialValues: { foo: string; }; validate: (props: { foo: string; }) => void; }
2929

3030
initialValues: {

‎tests/baselines/reference/constraintOfRecursivelyMappedTypeWithConditionalIsResolvable.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ interface Map<K, V> {
66
}
77

88
export type ImmutableTypes = IImmutableMap<any>;
9-
>ImmutableTypes : IImmutableMap<any>
9+
>ImmutableTypes : ImmutableTypes
1010

1111
export type ImmutableModel<T> = { [K in keyof T]: T[K] extends ImmutableTypes ? T[K] : never };
1212
>ImmutableModel : ImmutableModel<T>
@@ -19,7 +19,7 @@ export interface IImmutableMap<T extends ImmutableModel<T>> extends Map<string,
1919
}
2020

2121
export type ImmutableTypes2 = IImmutableMap2<any>;
22-
>ImmutableTypes2 : IImmutableMap2<any>
22+
>ImmutableTypes2 : ImmutableTypes2
2323

2424
type isImmutableType<T> = [T] extends [ImmutableTypes2] ? T : never;
2525
>isImmutableType : isImmutableType<T>

‎tests/baselines/reference/declarationsForIndirectTypeAliasReference.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ declare type StringHash = Hash<string>;
6161
interface StringHash2 extends Hash<string> {
6262
}
6363
//// [a.d.ts]
64-
import { StringHash2 } from "./b";
64+
import { StringHash, StringHash2 } from "./b";
6565
export { doSome };
66-
declare function doSome(arg1: string, arg2?: import("./b").Hash<string>, arg3?: StringHash2): void;
66+
declare function doSome(arg1: string, arg2?: StringHash, arg3?: StringHash2): void;

0 commit comments

Comments
 (0)