Skip to content

Commit d872b3a

Browse files
committed
Accept new baselines
1 parent 9cc9fb9 commit d872b3a

35 files changed

+101
-156
lines changed

tests/baselines/reference/indexingTypesWithNever.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ declare function genericFn3<
6969

7070
// Should be never
7171
const result5 = genericFn3({ g: "gtest", h: "htest" }, "g", "h"); // 'g' & 'h' will reduce to never
72-
>result5 : unknown
73-
>genericFn3({ g: "gtest", h: "htest" }, "g", "h") : unknown
72+
>result5 : never
73+
>genericFn3({ g: "gtest", h: "htest" }, "g", "h") : never
7474
>genericFn3 : <T extends { [K in keyof T]: T[K]; }, U extends keyof T, V extends keyof T>(obj: T, u: U, v: V) => T[U & V]
7575
>{ g: "gtest", h: "htest" } : { g: string; h: string; }
7676
>g : string

tests/baselines/reference/inferTypes1.errors.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ tests/cases/conformance/types/conditional/inferTypes1.ts(145,40): error TS2322:
107107
type T50 = X3<{}>; // never
108108
type T51 = X3<{ a: (x: string) => void }>; // never
109109
type T52 = X3<{ a: (x: string) => void, b: (x: string) => void }>; // string
110-
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // string & number
110+
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // never
111111
type T54 = X3<{ a: (x: number) => void, b: () => void }>; // number
112112

113113
type T60 = infer U; // Error

tests/baselines/reference/inferTypes1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type X3<T> = T extends { a: (x: infer U) => void, b: (x: infer U) => void } ? U
6969
type T50 = X3<{}>; // never
7070
type T51 = X3<{ a: (x: string) => void }>; // never
7171
type T52 = X3<{ a: (x: string) => void, b: (x: string) => void }>; // string
72-
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // string & number
72+
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // never
7373
type T54 = X3<{ a: (x: number) => void, b: () => void }>; // number
7474

7575
type T60 = infer U; // Error

tests/baselines/reference/inferTypes1.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ type T52 = X3<{ a: (x: string) => void, b: (x: string) => void }>; // string
297297
>b : Symbol(b, Decl(inferTypes1.ts, 69, 39))
298298
>x : Symbol(x, Decl(inferTypes1.ts, 69, 44))
299299

300-
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // string & number
300+
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // never
301301
>T53 : Symbol(T53, Decl(inferTypes1.ts, 69, 66))
302302
>X3 : Symbol(X3, Decl(inferTypes1.ts, 63, 52))
303303
>a : Symbol(a, Decl(inferTypes1.ts, 70, 15))

tests/baselines/reference/inferTypes1.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ type T52 = X3<{ a: (x: string) => void, b: (x: string) => void }>; // string
211211
>b : (x: string) => void
212212
>x : string
213213

214-
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // string & number
215-
>T53 : number & string
214+
type T53 = X3<{ a: (x: number) => void, b: (x: string) => void }>; // never
215+
>T53 : never
216216
>a : (x: number) => void
217217
>x : number
218218
>b : (x: string) => void

tests/baselines/reference/intersectionReduction.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ declare const sym1: unique symbol;
55
declare const sym2: unique symbol;
66

77
type T1 = string & 'a'; // 'a'
8-
type T2 = 'a' & string & 'b'; // 'a' & 'b'
8+
type T2 = 'a' & string & 'b'; // never
99
type T3 = number & 10; // 10
10-
type T4 = 10 & number & 20; // 10 & 20
10+
type T4 = 10 & number & 20; // never
1111
type T5 = symbol & typeof sym1; // typeof sym1
12-
type T6 = typeof sym1 & symbol & typeof sym2; // typeof sym1 & typeof sym2
13-
type T7 = string & 'a' & number & 10 & symbol & typeof sym1; // 'a' & 10 & typeof sym1
12+
type T6 = typeof sym1 & symbol & typeof sym2; // never
13+
type T7 = string & 'a' & number & 10 & symbol & typeof sym1; // never
1414

1515
type T10 = string & ('a' | 'b'); // 'a' | 'b'
1616
type T11 = (string | number) & ('a' | 10); // 'a' | 10

tests/baselines/reference/intersectionReduction.symbols

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ declare const sym2: unique symbol;
1010
type T1 = string & 'a'; // 'a'
1111
>T1 : Symbol(T1, Decl(intersectionReduction.ts, 3, 34))
1212

13-
type T2 = 'a' & string & 'b'; // 'a' & 'b'
13+
type T2 = 'a' & string & 'b'; // never
1414
>T2 : Symbol(T2, Decl(intersectionReduction.ts, 5, 23))
1515

1616
type T3 = number & 10; // 10
1717
>T3 : Symbol(T3, Decl(intersectionReduction.ts, 6, 29))
1818

19-
type T4 = 10 & number & 20; // 10 & 20
19+
type T4 = 10 & number & 20; // never
2020
>T4 : Symbol(T4, Decl(intersectionReduction.ts, 7, 22))
2121

2222
type T5 = symbol & typeof sym1; // typeof sym1
2323
>T5 : Symbol(T5, Decl(intersectionReduction.ts, 8, 27))
2424
>sym1 : Symbol(sym1, Decl(intersectionReduction.ts, 2, 13))
2525

26-
type T6 = typeof sym1 & symbol & typeof sym2; // typeof sym1 & typeof sym2
26+
type T6 = typeof sym1 & symbol & typeof sym2; // never
2727
>T6 : Symbol(T6, Decl(intersectionReduction.ts, 9, 31))
2828
>sym1 : Symbol(sym1, Decl(intersectionReduction.ts, 2, 13))
2929
>sym2 : Symbol(sym2, Decl(intersectionReduction.ts, 3, 13))
3030

31-
type T7 = string & 'a' & number & 10 & symbol & typeof sym1; // 'a' & 10 & typeof sym1
31+
type T7 = string & 'a' & number & 10 & symbol & typeof sym1; // never
3232
>T7 : Symbol(T7, Decl(intersectionReduction.ts, 10, 45))
3333
>sym1 : Symbol(sym1, Decl(intersectionReduction.ts, 2, 13))
3434

tests/baselines/reference/intersectionReduction.types

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@ declare const sym2: unique symbol;
1010
type T1 = string & 'a'; // 'a'
1111
>T1 : "a"
1212

13-
type T2 = 'a' & string & 'b'; // 'a' & 'b'
14-
>T2 : T2
13+
type T2 = 'a' & string & 'b'; // never
14+
>T2 : never
1515

1616
type T3 = number & 10; // 10
1717
>T3 : 10
1818

19-
type T4 = 10 & number & 20; // 10 & 20
20-
>T4 : T4
19+
type T4 = 10 & number & 20; // never
20+
>T4 : never
2121

2222
type T5 = symbol & typeof sym1; // typeof sym1
2323
>T5 : unique symbol
2424
>sym1 : unique symbol
2525

26-
type T6 = typeof sym1 & symbol & typeof sym2; // typeof sym1 & typeof sym2
27-
>T6 : T6
26+
type T6 = typeof sym1 & symbol & typeof sym2; // never
27+
>T6 : never
2828
>sym1 : unique symbol
2929
>sym2 : unique symbol
3030

31-
type T7 = string & 'a' & number & 10 & symbol & typeof sym1; // 'a' & 10 & typeof sym1
32-
>T7 : T7
31+
type T7 = string & 'a' & number & 10 & symbol & typeof sym1; // never
32+
>T7 : never
3333
>sym1 : unique symbol
3434

3535
type T10 = string & ('a' | 'b'); // 'a' | 'b'

tests/baselines/reference/intersectionTypeInference2.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ declare function f<T>(x: { prop: T }): T;
44
declare const a: { prop: string } & { prop: number };
55
declare const b: { prop: string & number };
66

7-
f(a); // string & number
8-
f(b); // string & number
7+
f(a); // never
8+
f(b); // never
99

1010
// Repro from #18354
1111

@@ -17,7 +17,7 @@ f2(obj, 'b');
1717

1818

1919
//// [intersectionTypeInference2.js]
20-
f(a); // string & number
21-
f(b); // string & number
20+
f(a); // never
21+
f(b); // never
2222
f2(obj, 'a');
2323
f2(obj, 'b');

tests/baselines/reference/intersectionTypeInference2.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ declare const b: { prop: string & number };
1616
>b : Symbol(b, Decl(intersectionTypeInference2.ts, 3, 13))
1717
>prop : Symbol(prop, Decl(intersectionTypeInference2.ts, 3, 18))
1818

19-
f(a); // string & number
19+
f(a); // never
2020
>f : Symbol(f, Decl(intersectionTypeInference2.ts, 0, 0))
2121
>a : Symbol(a, Decl(intersectionTypeInference2.ts, 2, 13))
2222

23-
f(b); // string & number
23+
f(b); // never
2424
>f : Symbol(f, Decl(intersectionTypeInference2.ts, 0, 0))
2525
>b : Symbol(b, Decl(intersectionTypeInference2.ts, 3, 13))
2626

0 commit comments

Comments
 (0)