Accept new baselines

ahejlsberg · ahejlsberg · commit 5bbadb66ab01 · 2018-05-21T16:43:46.000-07:00
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.types
@@ -30,7 +30,7 @@ var derived2: Derived2;
 
 var r2 = true ? 1 : '';
 >r2 : string | number
->true ? 1 : '' : 1 | ""
+>true ? 1 : '' : "" | 1
 >true : true
 >1 : 1
 >'' : ""
diff --git a/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -15,7 +15,7 @@ var i: I<string>;
 >I : I<T>
 
 var y = i(""); // y should be string
->y : string
+>y : ""
 >i("") : ""
 >i : I<string>
 >"" : ""
diff --git a/tests/baselines/reference/conditionalExpression1.types b/tests/baselines/reference/conditionalExpression1.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/conditionalExpression1.ts ===
 var x: boolean = (true ? 1 : ""); // should be an error
 >x : boolean
->(true ? 1 : "") : 1 | ""
->true ? 1 : "" : 1 | ""
+>(true ? 1 : "") : "" | 1
+>true ? 1 : "" : "" | 1
 >true : true
 >1 : 1
 >"" : ""
diff --git a/tests/baselines/reference/conditionalExpressions2.types b/tests/baselines/reference/conditionalExpressions2.types
@@ -15,7 +15,7 @@ var b = false ? undefined : 0;
 
 var c = false ? 1 : 0;
 >c : number
->false ? 1 : 0 : 1 | 0
+>false ? 1 : 0 : 0 | 1
 >false : false
 >1 : 1
 >0 : 0
diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.types
@@ -218,7 +218,7 @@ var result10: (t: X) => any = true ? (m) => m.propertyX1 : (n) => n.propertyX2;
 //Expr1 and Expr2 are literals
 var result11: any = true ? 1 : 'string';
 >result11 : any
->true ? 1 : 'string' : 1 | "string"
+>true ? 1 : 'string' : "string" | 1
 >true : true
 >1 : 1
 >'string' : "string"
diff --git a/tests/baselines/reference/conditionalTypes1.types b/tests/baselines/reference/conditionalTypes1.types
@@ -589,8 +589,8 @@ function zeroOf<T extends number | string | boolean>(value: T) {
 ><ZeroOf<T>>(typeof value === "number" ? 0 : typeof value === "string" ? "" : false) : ZeroOf<T>
 >ZeroOf : ZeroOf<T>
 >T : T
->(typeof value === "number" ? 0 : typeof value === "string" ? "" : false) : false | 0 | ""
->typeof value === "number" ? 0 : typeof value === "string" ? "" : false : false | 0 | ""
+>(typeof value === "number" ? 0 : typeof value === "string" ? "" : false) : false | "" | 0
+>typeof value === "number" ? 0 : typeof value === "string" ? "" : false : false | "" | 0
 >typeof value === "number" : boolean
 >typeof value : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
 >value : T
diff --git a/tests/baselines/reference/declFileTypeAnnotationParenType.types b/tests/baselines/reference/declFileTypeAnnotationParenType.types
@@ -24,7 +24,7 @@ var y = [() => new c()];
 var k: (() => c) | string = (() => new c()) || "";
 >k : string | (() => c)
 >c : c
->(() => new c()) || "" : (() => c) | ""
+>(() => new c()) || "" : "" | (() => c)
 >(() => new c()) : () => c
 >() => new c() : () => c
 >new c() : c
diff --git a/tests/baselines/reference/literalTypes2.types b/tests/baselines/reference/literalTypes2.types
@@ -555,7 +555,7 @@ class C2 {
 >bar : () => 1 | 0
 
         return cond ? 0 : 1;
->cond ? 0 : 1 : 1 | 0
+>cond ? 0 : 1 : 0 | 1
 >cond : boolean
 >0 : 0
 >1 : 1
diff --git a/tests/baselines/reference/literalTypes3.types b/tests/baselines/reference/literalTypes3.types
@@ -107,7 +107,7 @@ function f5(x: number, y: 1 | 2) {
 >y : 1 | 2
 
         x;  // 0 | 1 | 2
->x : 1 | 2 | 0
+>x : 0 | 1 | 2
     }
 }
 
@@ -126,7 +126,7 @@ function f6(x: number, y: 1 | 2) {
 >x : number
 
         x;  // 0 | 1 | 2
->x : 1 | 2 | 0
+>x : 0 | 1 | 2
     }
 }
 
diff --git a/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -15,7 +15,7 @@ var i: I<string>;
 >I : I<T>
 
 var y = new i(""); // y should be string
->y : string
+>y : ""
 >new i("") : ""
 >i : I<string>
 >"" : ""
diff --git a/tests/baselines/reference/parserArgumentList1.types b/tests/baselines/reference/parserArgumentList1.types
@@ -26,7 +26,7 @@ export function removeClass (node:HTMLElement, className:string) {
 >rightDelimiter : any
 
 		return leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '';
->leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '' : " " | ""
+>leftDelimiter.length + rightDelimiter.length === 2 ? ' ' : '' : "" | " "
 >leftDelimiter.length + rightDelimiter.length === 2 : boolean
 >leftDelimiter.length + rightDelimiter.length : any
 >leftDelimiter.length : any
diff --git a/tests/baselines/reference/subtypesOfTypeParameter.types b/tests/baselines/reference/subtypesOfTypeParameter.types
@@ -144,14 +144,14 @@ function f2<T, U>(x: T, y: U) {
 
     var r2 = true ? '' : x;
 >r2 : string | T
->true ? '' : x : T | ""
+>true ? '' : x : "" | T
 >true : true
 >'' : ""
 >x : T
 
     var r2 = true ? x : '';
 >r2 : string | T
->true ? x : '' : T | ""
+>true ? x : '' : "" | T
 >true : true
 >x : T
 >'' : ""
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.types
@@ -259,14 +259,14 @@ function f6<T extends String>(x: T) {
 
     var r2 = true ? '' : x; // ok
 >r2 : string | T
->true ? '' : x : T | ""
+>true ? '' : x : "" | T
 >true : true
 >'' : ""
 >x : T
 
     var r2 = true ? x : ''; // ok
 >r2 : string | T
->true ? x : '' : T | ""
+>true ? x : '' : "" | T
 >true : true
 >x : T
 >'' : ""
diff --git a/tests/baselines/reference/uniqueSymbols.types b/tests/baselines/reference/uniqueSymbols.types
@@ -699,19 +699,19 @@ g(N["s"]);
 
 // falsy expressions
 s || "";
->s || "" : unique symbol | ""
+>s || "" : "" | unique symbol
 >s : unique symbol
 >"" : ""
 
 N.s || "";
->N.s || "" : unique symbol | ""
+>N.s || "" : "" | unique symbol
 >N.s : unique symbol
 >N : typeof N
 >s : unique symbol
 >"" : ""
 
 N["s"] || "";
->N["s"] || "" : unique symbol | ""
+>N["s"] || "" : "" | unique symbol
 >N["s"] : unique symbol
 >N : typeof N
 >"s" : "s"
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.types b/tests/baselines/reference/uniqueSymbolsDeclarations.types
@@ -699,19 +699,19 @@ g(N["s"]);
 
 // falsy expressions
 s || "";
->s || "" : unique symbol | ""
+>s || "" : "" | unique symbol
 >s : unique symbol
 >"" : ""
 
 N.s || "";
->N.s || "" : unique symbol | ""
+>N.s || "" : "" | unique symbol
 >N.s : unique symbol
 >N : typeof N
 >s : unique symbol
 >"" : ""
 
 N["s"] || "";
->N["s"] || "" : unique symbol | ""
+>N["s"] || "" : "" | unique symbol
 >N["s"] : unique symbol
 >N : typeof N
 >"s" : "s"

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ function f5(x: number, y: 1 \| 2) {`
`107`	`107`	`>y : 1 \| 2`
`108`	`108`
`109`	`109`	`x; // 0 \| 1 \| 2`
`110`		`->x : 1 \| 2 \| 0`
	`110`	`+>x : 0 \| 1 \| 2`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`@@ -126,7 +126,7 @@ function f6(x: number, y: 1 \| 2) {`
`126`	`126`	`>x : number`
`127`	`127`
`128`	`128`	`x; // 0 \| 1 \| 2`
`129`		`->x : 1 \| 2 \| 0`
	`129`	`+>x : 0 \| 1 \| 2`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`