Skip to content

Commit e091e35

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent d90d6b9 commit e091e35

8 files changed

Lines changed: 15 additions & 25 deletions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,6 +2105,7 @@ declare namespace ts {
21052105
BooleanLike = 136,
21062106
EnumLike = 272,
21072107
ESSymbolLike = 1536,
2108+
VoidLike = 6144,
21082109
UnionOrIntersection = 393216,
21092110
StructuredType = 458752,
21102111
TypeVariable = 1081344,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,6 +2105,7 @@ declare namespace ts {
21052105
BooleanLike = 136,
21062106
EnumLike = 272,
21072107
ESSymbolLike = 1536,
2108+
VoidLike = 6144,
21082109
UnionOrIntersection = 393216,
21092110
StructuredType = 458752,
21102111
TypeVariable = 1081344,

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
tests/cases/compiler/errorMessagesIntersectionTypes04.ts(17,5): error TS2322: Type 'A & B' is not assignable to type 'number'.
22
tests/cases/compiler/errorMessagesIntersectionTypes04.ts(18,5): error TS2322: Type 'A & B' is not assignable to type 'boolean'.
33
tests/cases/compiler/errorMessagesIntersectionTypes04.ts(19,5): error TS2322: Type 'A & B' is not assignable to type 'string'.
4-
tests/cases/compiler/errorMessagesIntersectionTypes04.ts(21,5): error TS2322: Type '(number & true) | (number & false)' is not assignable to type 'string'.
5-
Type 'number & true' is not assignable to type 'string'.
64

75

8-
==== tests/cases/compiler/errorMessagesIntersectionTypes04.ts (4 errors) ====
6+
==== tests/cases/compiler/errorMessagesIntersectionTypes04.ts (3 errors) ====
97
interface A {
108
a;
119
}
@@ -33,7 +31,4 @@ tests/cases/compiler/errorMessagesIntersectionTypes04.ts(21,5): error TS2322: Ty
3331
!!! error TS2322: Type 'A & B' is not assignable to type 'string'.
3432

3533
str = num_and_bool;
36-
~~~
37-
!!! error TS2322: Type '(number & true) | (number & false)' is not assignable to type 'string'.
38-
!!! error TS2322: Type 'number & true' is not assignable to type 'string'.
3934
}

‎tests/baselines/reference/errorMessagesIntersectionTypes04.types‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function f<T, U extends A, V extends U>(): void {
3636
>B : B
3737

3838
let num_and_bool: number & boolean;
39-
>num_and_bool : (number & true) | (number & false)
39+
>num_and_bool : never
4040

4141
num = a_and_b;
4242
>num = a_and_b : A & B
@@ -54,7 +54,7 @@ function f<T, U extends A, V extends U>(): void {
5454
>a_and_b : A & B
5555

5656
str = num_and_bool;
57-
>str = num_and_bool : (number & true) | (number & false)
57+
>str = num_and_bool : never
5858
>str : string
59-
>num_and_bool : (number & true) | (number & false)
59+
>num_and_bool : never
6060
}

‎tests/baselines/reference/keyofAndIndexedAccessErrors.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ type T02 = keyof keyof Object;
3434
>Object : Object
3535

3636
type T03 = keyof keyof keyof Object;
37-
>T03 : "toString" | "valueOf" | ("toString" & number) | ("toLocaleString" & number) | ("valueOf" & number) | ("toFixed" & number) | ("toExponential" & number) | ("toPrecision" & number)
37+
>T03 : "toString" | "valueOf"
3838
>Object : Object
3939

4040
type T04 = keyof keyof keyof keyof Object;
41-
>T04 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | ("toString" & number) | ("valueOf" & number) | (number & "length") | (number & "toString") | (number & "toLocaleString") | (number & "valueOf") | (number & "charAt") | (number & "charCodeAt") | (number & "concat") | (number & "indexOf") | (number & "lastIndexOf") | (number & "localeCompare") | (number & "match") | (number & "replace") | (number & "search") | (number & "slice") | (number & "split") | (number & "substring") | (number & "toLowerCase") | (number & "toLocaleLowerCase") | (number & "toUpperCase") | (number & "toLocaleUpperCase") | (number & "trim") | (number & "substr") | (number & "toFixed") | (number & "toExponential") | (number & "toPrecision") | ("length" & number) | ("charAt" & number) | ("charCodeAt" & number) | ("concat" & number) | ("indexOf" & number) | ("lastIndexOf" & number) | ("localeCompare" & number) | ("match" & number) | ("replace" & number) | ("search" & number) | ("slice" & number) | ("split" & number) | ("substring" & number) | ("toLowerCase" & number) | ("toLocaleLowerCase" & number) | ("toUpperCase" & number) | ("toLocaleUpperCase" & number) | ("trim" & number) | ("substr" & number)
41+
>T04 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
4242
>Object : Object
4343

4444
type T05 = keyof keyof keyof keyof keyof Object;
45-
>T05 : "toString" | "valueOf" | ("toString" & number) | ("toLocaleString" & number) | ("valueOf" & number) | ("toFixed" & number) | ("toExponential" & number) | ("toPrecision" & number)
45+
>T05 : "toString" | "valueOf"
4646
>Object : Object
4747

4848
type T06 = keyof keyof keyof keyof keyof keyof Object;
49-
>T06 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | ("toString" & number) | ("valueOf" & number) | (number & "length") | (number & "toString") | (number & "toLocaleString") | (number & "valueOf") | (number & "charAt") | (number & "charCodeAt") | (number & "concat") | (number & "indexOf") | (number & "lastIndexOf") | (number & "localeCompare") | (number & "match") | (number & "replace") | (number & "search") | (number & "slice") | (number & "split") | (number & "substring") | (number & "toLowerCase") | (number & "toLocaleLowerCase") | (number & "toUpperCase") | (number & "toLocaleUpperCase") | (number & "trim") | (number & "substr") | (number & "toFixed") | (number & "toExponential") | (number & "toPrecision") | ("length" & number) | ("charAt" & number) | ("charCodeAt" & number) | ("concat" & number) | ("indexOf" & number) | ("lastIndexOf" & number) | ("localeCompare" & number) | ("match" & number) | ("replace" & number) | ("search" & number) | ("slice" & number) | ("split" & number) | ("substring" & number) | ("toLowerCase" & number) | ("toLocaleLowerCase" & number) | ("toUpperCase" & number) | ("toLocaleUpperCase" & number) | ("trim" & number) | ("substr" & number)
49+
>T06 : number | "length" | "toString" | "valueOf" | "charAt" | "charCodeAt" | "concat" | "indexOf" | "lastIndexOf" | "localeCompare" | "match" | "replace" | "search" | "slice" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr"
5050
>Object : Object
5151

5252
type T10 = Shape["name"];

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts(18,10): error TS2678: Type '(number & true) | (number & false)' is not comparable to type 'string & number'.
2-
Type 'number & false' is not comparable to type 'string & number'.
3-
Type 'number & false' is not comparable to type 'string'.
41
tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts(22,10): error TS2678: Type 'boolean' is not comparable to type 'string & number'.
52

63

7-
==== tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts (2 errors) ====
4+
==== tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithIntersectionTypes01.ts (1 errors) ====
85
var strAndNum: string & number;
96
var numAndBool: number & boolean;
107
var str: string;
@@ -23,10 +20,6 @@ tests/cases/conformance/types/typeRelationships/comparable/switchCaseWithInterse
2320

2421
// Overlap in constituents
2522
case numAndBool:
26-
~~~~~~~~~~
27-
!!! error TS2678: Type '(number & true) | (number & false)' is not comparable to type 'string & number'.
28-
!!! error TS2678: Type 'number & false' is not comparable to type 'string & number'.
29-
!!! error TS2678: Type 'number & false' is not comparable to type 'string'.
3023
break;
3124

3225
// No relation

‎tests/baselines/reference/switchCaseWithIntersectionTypes01.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var strAndNum: string & number;
33
>strAndNum : string & number
44

55
var numAndBool: number & boolean;
6-
>numAndBool : (number & true) | (number & false)
6+
>numAndBool : never
77

88
var str: string;
99
>str : string
@@ -34,7 +34,7 @@ switch (strAndNum) {
3434

3535
// Overlap in constituents
3636
case numAndBool:
37-
>numAndBool : (number & true) | (number & false)
37+
>numAndBool : never
3838

3939
break;
4040

‎tests/baselines/reference/typeGuardsWithInstanceOf.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (!(result instanceof RegExp)) {
2525

2626
} else if (!result.global) {
2727
>!result.global : boolean
28-
>result.global : (string & true) | (string & false)
28+
>result.global : never
2929
>result : I & RegExp
30-
>global : (string & true) | (string & false)
30+
>global : never
3131
}

0 commit comments

Comments
 (0)