From e60d7ffe7dc5c1b5d9474e1fd18840b000c0e99e Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 14 Dec 2019 14:55:27 -0800
Subject: [PATCH] Accept new baselines

---
 .../bestCommonTypeOfConditionalExpressions.types | 10 +++++-----
 .../functionWithMultipleReturnStatements2.types  |  6 +++---
 ...subtypesOfTypeParameterWithConstraints2.types |  8 ++++----
 .../reference/typeGuardRedundancy.types          | 16 ++++++++--------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
index 60483f27213..e94408dfb1e 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
@@ -64,8 +64,8 @@ var r5 = true ? b : a; // typeof b
 >a : { x: number; y?: number; }
 
 var r6 = true ? (x: number) => { } : (x: Object) => { }; // returns number => void
->r6 : (x: number) => void
->true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
+>r6 : ((x: number) => void) | ((x: Object) => void)
+>true ? (x: number) => { } : (x: Object) => { } : ((x: number) => void) | ((x: Object) => void)
 >true : true
 >(x: number) => { } : (x: number) => void
 >x : number
@@ -75,7 +75,7 @@ var r6 = true ? (x: number) => { } : (x: Object) => { }; // returns number => vo
 var r7: (x: Object) => void = true ? (x: number) => { } : (x: Object) => { }; 
 >r7 : (x: Object) => void
 >x : Object
->true ? (x: number) => { } : (x: Object) => { } : (x: number) => void
+>true ? (x: number) => { } : (x: Object) => { } : ((x: number) => void) | ((x: Object) => void)
 >true : true
 >(x: number) => { } : (x: number) => void
 >x : number
@@ -83,8 +83,8 @@ var r7: (x: Object) => void = true ? (x: number) => { } : (x: Object) => { };
 >x : Object
 
 var r8 = true ? (x: Object) => { } : (x: number) => { }; // returns Object => void
->r8 : (x: Object) => void
->true ? (x: Object) => { } : (x: number) => { } : (x: Object) => void
+>r8 : ((x: Object) => void) | ((x: number) => void)
+>true ? (x: Object) => { } : (x: number) => { } : ((x: Object) => void) | ((x: number) => void)
 >true : true
 >(x: Object) => { } : (x: Object) => void
 >x : Object
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.types b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
index e0a9fed1a1b..f528ad04aae 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements2.types
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
@@ -58,7 +58,7 @@ function f4() {
 }
 
 function f5() {
->f5 : () => Object
+>f5 : () => Object | 1
 
     return 1;
 >1 : 1
@@ -136,7 +136,7 @@ function f10() {
 
 // returns number => void
 function f11() {
->f11 : () => (x: number) => void
+>f11 : () => ((x: number) => void) | ((x: Object) => void)
 
     if (true) {
 >true : true
@@ -154,7 +154,7 @@ function f11() {
 
 // returns Object => void
 function f12() {
->f12 : () => (x: Object) => void
+>f12 : () => ((x: Object) => void) | ((x: number) => void)
 
     if (true) {
 >true : true
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types
index daf700b06f2..dc3f90fa545 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types
@@ -566,16 +566,16 @@ function f20<T extends Number>(x: T) {
 >x : T
 
     var r19 = true ? new Object() : x; // ok
->r19 : Object
->true ? new Object() : x : Object
+>r19 : Object | T
+>true ? new Object() : x : Object | T
 >true : true
 >new Object() : Object
 >Object : ObjectConstructor
 >x : T
 
     var r19 = true ? x : new Object(); // ok
->r19 : Object
->true ? x : new Object() : Object
+>r19 : Object | T
+>true ? x : new Object() : Object | T
 >true : true
 >x : T
 >new Object() : Object
diff --git a/tests/baselines/reference/typeGuardRedundancy.types b/tests/baselines/reference/typeGuardRedundancy.types
index 10bec968ed2..82b217494f3 100644
--- a/tests/baselines/reference/typeGuardRedundancy.types
+++ b/tests/baselines/reference/typeGuardRedundancy.types
@@ -3,8 +3,8 @@ var x: string|number;
 >x : string | number
 
 var r1 = typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed;
->r1 : (from: number, length?: number) => string
->typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
+>r1 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
+>typeof x === "string" && typeof x === "string" ? x.substr : x.toFixed : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
 >typeof x === "string" && typeof x === "string" : boolean
 >typeof x === "string" : boolean
 >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;
 >toFixed : (fractionDigits?: number) => string
 
 var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr;
->r2 : (from: number, length?: number) => string
->!(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr : (from: number, length?: number) => string
+>r2 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
+>!(typeof x === "string" && typeof x === "string") ? x.toFixed : x.substr : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
 >!(typeof x === "string" && typeof x === "string") : boolean
 >(typeof x === "string" && typeof x === "string") : boolean
 >typeof x === "string" && typeof x === "string" : boolean
@@ -43,8 +43,8 @@ var r2 = !(typeof x === "string" && typeof x === "string") ? x.toFixed : x.subst
 >substr : (from: number, length?: number) => string
 
 var r3 = typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed;
->r3 : (from: number, length?: number) => string
->typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed : (from: number, length?: number) => string
+>r3 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
+>typeof x === "string" || typeof x === "string" ? x.substr : x.toFixed : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
 >typeof x === "string" || typeof x === "string" : boolean
 >typeof x === "string" : boolean
 >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;
 >toFixed : (fractionDigits?: number) => string
 
 var r4 = !(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr;
->r4 : (from: number, length?: number) => string
->!(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr : (from: number, length?: number) => string
+>r4 : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
+>!(typeof x === "string" || typeof x === "string") ? x.toFixed : x.substr : ((from: number, length?: number) => string) | ((fractionDigits?: number) => string)
 >!(typeof x === "string" || typeof x === "string") : boolean
 >(typeof x === "string" || typeof x === "string") : boolean
 >typeof x === "string" || typeof x === "string" : boolean