Skip to content

Commit e60d7ff

Browse files
committed
Accept new baselines
1 parent 42c0451 commit e60d7ff

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ var r5 = true ? b : a; // typeof b
6464
>a : { x: number; y?: number; }
6565

6666
var r6 = true ? (x: number) => { } : (x: Object) => { }; // returns number => void
67-
>r6 : (x: number) => void
68-
>true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
67+
>r6 : ((x: number) => void) | ((x: Object) => void)
68+
>true ? (x: number) => { } : (x: Object) => { } : ((x: number) => void) | ((x: Object) => void)
6969
>true : true
7070
>(x: number) => { } : (x: number) => void
7171
>x : number
@@ -75,16 +75,16 @@ var r6 = true ? (x: number) => { } : (x: Object) => { }; // returns number => vo
7575
var r7: (x: Object) => void = true ? (x: number) => { } : (x: Object) => { };
7676
>r7 : (x: Object) => void
7777
>x : Object
78-
>true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
78+
>true ? (x: number) => { } : (x: Object) => { } : ((x: number) => void) | ((x: Object) => void)
7979
>true : true
8080
>(x: number) => { } : (x: number) => void
8181
>x : number
8282
>(x: Object) => { } : (x: Object) => void
8383
>x : Object
8484

8585
var r8 = true ? (x: Object) => { } : (x: number) => { }; // returns Object => void
86-
>r8 : (x: Object) => void
87-
>true ? (x: Object) => { } : (x: number) => { } : (x: Object) => void
86+
>r8 : ((x: Object) => void) | ((x: number) => void)
87+
>true ? (x: Object) => { } : (x: number) => { } : ((x: Object) => void) | ((x: number) => void)
8888
>true : true
8989
>(x: Object) => { } : (x: Object) => void
9090
>x : Object

tests/baselines/reference/functionWithMultipleReturnStatements2.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function f4() {
5858
}
5959

6060
function f5() {
61-
>f5 : () => Object
61+
>f5 : () => Object | 1
6262

6363
return 1;
6464
>1 : 1
@@ -136,7 +136,7 @@ function f10() {
136136

137137
// returns number => void
138138
function f11() {
139-
>f11 : () => (x: number) => void
139+
>f11 : () => ((x: number) => void) | ((x: Object) => void)
140140

141141
if (true) {
142142
>true : true
@@ -154,7 +154,7 @@ function f11() {
154154

155155
// returns Object => void
156156
function f12() {
157-
>f12 : () => (x: Object) => void
157+
>f12 : () => ((x: Object) => void) | ((x: number) => void)
158158

159159
if (true) {
160160
>true : true

tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -566,16 +566,16 @@ function f20<T extends Number>(x: T) {
566566
>x : T
567567

568568
var r19 = true ? new Object() : x; // ok
569-
>r19 : Object
570-
>true ? new Object() : x : Object
569+
>r19 : Object | T
570+
>true ? new Object() : x : Object | T
571571
>true : true
572572
>new Object() : Object
573573
>Object : ObjectConstructor
574574
>x : T
575575

576576
var r19 = true ? x : new Object(); // ok
577-
>r19 : Object
578-
>true ? x : new Object() : Object
577+
>r19 : Object | T
578+
>true ? x : new Object() : Object | T
579579
>true : true
580580
>x : T
581581
>new Object() : Object

tests/baselines/reference/typeGuardRedundancy.types

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ var x: string|number;
33
>x : string | number
44

55
var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
6-
>r1 : (from: number, length?: number) => string
7-
>typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
6+
>r1 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
7+
>typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
88
>typeof x === "string" && typeof x === "string" : boolean
99
>typeof x === "string" : boolean
1010
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
@@ -22,8 +22,8 @@ var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
2222
>toFixed : (fractionDigits?: number) => string
2323

2424
var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr;
25-
>r2 : (from: number, length?: number) => string
26-
>!(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr : (from: number, length?: number) => string
25+
>r2 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
26+
>!(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
2727
>!(typeof x === "string" && typeof x === "string") : boolean
2828
>(typeof x === "string" && typeof x === "string") : boolean
2929
>typeof x === "string" && typeof x === "string" : boolean
@@ -43,8 +43,8 @@ var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.subst
4343
>substr : (from: number, length?: number) => string
4444

4545
var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
46-
>r3 : (from: number, length?: number) => string
47-
>typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
46+
>r3 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
47+
>typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
4848
>typeof x === "string" || typeof x === "string" : boolean
4949
>typeof x === "string" : boolean
5050
>typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
@@ -62,8 +62,8 @@ var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
6262
>toFixed : (fractionDigits?: number) => string
6363

6464
var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr;
65-
>r4 : (from: number, length?: number) => string
66-
>!(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr : (from: number, length?: number) => string
65+
>r4 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
66+
>!(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
6767
>!(typeof x === "string" || typeof x === "string") : boolean
6868
>(typeof x === "string" || typeof x === "string") : boolean
6969
>typeof x === "string" || typeof x === "string" : boolean

0 commit comments

Comments
 (0)