Update baseline from merging with master

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit 132f9f97a7d3 · 2017-03-06T12:40:16.000-08:00
diff --git a/tests/baselines/reference/circularInferredTypeOfVariable.js b/tests/baselines/reference/circularInferredTypeOfVariable.js
@@ -1,5 +1,4 @@
 //// [circularInferredTypeOfVariable.ts]
-
 // Repro from #14428
 
 (async () => {
diff --git a/tests/baselines/reference/circularInferredTypeOfVariable.symbols b/tests/baselines/reference/circularInferredTypeOfVariable.symbols
@@ -1,34 +1,33 @@
 === tests/cases/compiler/circularInferredTypeOfVariable.ts ===
-
 // Repro from #14428
 
 (async () => {
     function foo(p: string[]): string[] {
->foo : Symbol(foo, Decl(circularInferredTypeOfVariable.ts, 3, 14))
->p : Symbol(p, Decl(circularInferredTypeOfVariable.ts, 4, 17))
+>foo : Symbol(foo, Decl(circularInferredTypeOfVariable.ts, 2, 14))
+>p : Symbol(p, Decl(circularInferredTypeOfVariable.ts, 3, 17))
 
         return [];
     }
 
     function bar(p: string[]): string[] {
->bar : Symbol(bar, Decl(circularInferredTypeOfVariable.ts, 6, 5))
->p : Symbol(p, Decl(circularInferredTypeOfVariable.ts, 8, 17))
+>bar : Symbol(bar, Decl(circularInferredTypeOfVariable.ts, 5, 5))
+>p : Symbol(p, Decl(circularInferredTypeOfVariable.ts, 7, 17))
 
         return [];
     }
 
     let a1: string[] | undefined = [];
->a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 12, 7))
+>a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 11, 7))
 
     while (true) {
         let a2 = foo(a1!);
->a2 : Symbol(a2, Decl(circularInferredTypeOfVariable.ts, 15, 11))
->foo : Symbol(foo, Decl(circularInferredTypeOfVariable.ts, 3, 14))
->a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 12, 7))
+>a2 : Symbol(a2, Decl(circularInferredTypeOfVariable.ts, 14, 11))
+>foo : Symbol(foo, Decl(circularInferredTypeOfVariable.ts, 2, 14))
+>a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 11, 7))
 
         a1 = await bar(a2);
->a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 12, 7))
->bar : Symbol(bar, Decl(circularInferredTypeOfVariable.ts, 6, 5))
->a2 : Symbol(a2, Decl(circularInferredTypeOfVariable.ts, 15, 11))
+>a1 : Symbol(a1, Decl(circularInferredTypeOfVariable.ts, 11, 7))
+>bar : Symbol(bar, Decl(circularInferredTypeOfVariable.ts, 5, 5))
+>a2 : Symbol(a2, Decl(circularInferredTypeOfVariable.ts, 14, 11))
     }
 });
diff --git a/tests/baselines/reference/circularInferredTypeOfVariable.types b/tests/baselines/reference/circularInferredTypeOfVariable.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/circularInferredTypeOfVariable.ts ===
-
 // Repro from #14428
 
 (async () => {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//// [circularInferredTypeOfVariable.ts]`
`2`		`-`
`3`	`2`	`// Repro from #14428`
`4`	`3`
`5`	`4`	`(async () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`=== tests/cases/compiler/circularInferredTypeOfVariable.ts ===`
`2`		`-`
`3`	`2`	`// Repro from #14428`
`4`	`3`
`5`	`4`	`(async () => {`