Merge branch 'master' into es3Decorators

tests/baselines/reference/2dArrays.types

@@ -28,7 +28,7 @@ class Board {
 >this.ships.every(function (val) { return val.isSunk; }) : boolean
 >this.ships.every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean
 >this.ships : Ship[]
->this : Board
+>this : this
 >ships : Ship[]
 >every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean
 >function (val) { return val.isSunk; } : (val: Ship) => boolean

tests/baselines/reference/accessOverriddenBaseClassMember1.types

@@ -15,11 +15,11 @@ class Point {
 >"x=" + this.x : string
 >"x=" : string
 >this.x : number
->this : Point
+>this : this
 >x : number
 >" y=" : string
 >this.y : number
->this : Point
+>this : this
 >y : number
     }
 }
@@ -50,7 +50,7 @@ class ColoredPoint extends Point {
 >toString : () => string
 >" color=" : string
 >this.color : string
->this : ColoredPoint
+>this : this
 >color : string
     }
 }

tests/baselines/reference/aliasAssignments.errors.txt

@@ -4,7 +4,7 @@ tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof "tes
 
 
 ==== tests/cases/compiler/aliasAssignments_1.ts (2 errors) ====
-    import moduleA = require("aliasAssignments_moduleA");
+    import moduleA = require("./aliasAssignments_moduleA");
     var x = moduleA;
     x = 1; // Should be error
     ~

tests/baselines/reference/aliasAssignments.js

@@ -6,7 +6,7 @@ export class someClass {
 }
 
 //// [aliasAssignments_1.ts]
-import moduleA = require("aliasAssignments_moduleA");
+import moduleA = require("./aliasAssignments_moduleA");
 var x = moduleA;
 x = 1; // Should be error
 var y = 1;
@@ -21,7 +21,7 @@ var someClass = (function () {
 })();
 exports.someClass = someClass;
 //// [aliasAssignments_1.js]
-var moduleA = require("aliasAssignments_moduleA");
+var moduleA = require("./aliasAssignments_moduleA");
 var x = moduleA;
 x = 1; // Should be error
 var y = 1;

tests/baselines/reference/aliasUsageInAccessorsOfClass.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsage1_moduleA.ts]
-import Backbone = require("aliasUsage1_backbone");
+import Backbone = require("./aliasUsage1_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsage1_main.ts]
-import Backbone = require("aliasUsage1_backbone");
-import moduleA = require("aliasUsage1_moduleA");
+import Backbone = require("./aliasUsage1_backbone");
+import moduleA = require("./aliasUsage1_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -40,7 +40,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsage1_backbone");
+var Backbone = require("./aliasUsage1_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -50,7 +50,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsage1_main.js]
-var moduleA = require("aliasUsage1_moduleA");
+var moduleA = require("./aliasUsage1_moduleA");
 var C2 = (function () {
     function C2() {
     }

tests/baselines/reference/aliasUsageInAccessorsOfClass.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsage1_main.ts ===
-import Backbone = require("aliasUsage1_backbone");
+import Backbone = require("./aliasUsage1_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsage1_main.ts, 0, 0))
 
-import moduleA = require("aliasUsage1_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsage1_main.ts, 0, 50))
+import moduleA = require("./aliasUsage1_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsage1_main.ts, 0, 52))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsage1_main.ts, 1, 48))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsage1_main.ts, 1, 50))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsage1_main.ts, 2, 34))
@@ -19,7 +19,7 @@ class C2 {
 
     x: IHasVisualizationModel;
 >x : Symbol(x, Decl(aliasUsage1_main.ts, 5, 10))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsage1_main.ts, 1, 48))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsage1_main.ts, 1, 50))
 
     get A() {
 >A : Symbol(A, Decl(aliasUsage1_main.ts, 6, 30), Decl(aliasUsage1_main.ts, 9, 5))
@@ -35,7 +35,7 @@ class C2 {
 
         x = moduleA;
 >x : Symbol(x, Decl(aliasUsage1_main.ts, 10, 10))
->moduleA : Symbol(moduleA, Decl(aliasUsage1_main.ts, 0, 50))
+>moduleA : Symbol(moduleA, Decl(aliasUsage1_main.ts, 0, 52))
     }
 }
 === tests/cases/compiler/aliasUsage1_backbone.ts ===
@@ -47,11 +47,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsage1_moduleA.ts ===
-import Backbone = require("aliasUsage1_backbone");
+import Backbone = require("./aliasUsage1_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsage1_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsage1_moduleA.ts, 0, 50))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsage1_moduleA.ts, 0, 52))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsage1_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsage1_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsage1_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInAccessorsOfClass.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsage1_main.ts ===
-import Backbone = require("aliasUsage1_backbone");
+import Backbone = require("./aliasUsage1_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsage1_moduleA");
+import moduleA = require("./aliasUsage1_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -26,7 +26,7 @@ class C2 {
 
         return this.x;
 >this.x : IHasVisualizationModel
->this : C2
+>this : this
 >x : IHasVisualizationModel
     }
     set A(x) {
@@ -48,7 +48,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsage1_moduleA.ts ===
-import Backbone = require("aliasUsage1_backbone");
+import Backbone = require("./aliasUsage1_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInArray.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInArray_moduleA.ts]
-import Backbone = require("aliasUsageInArray_backbone");
+import Backbone = require("./aliasUsageInArray_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInArray_main.ts]
-import Backbone = require("aliasUsageInArray_backbone");
-import moduleA = require("aliasUsageInArray_moduleA");
+import Backbone = require("./aliasUsageInArray_backbone");
+import moduleA = require("./aliasUsageInArray_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInArray_backbone");
+var Backbone = require("./aliasUsageInArray_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -44,6 +44,6 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInArray_main.js]
-var moduleA = require("aliasUsageInArray_moduleA");
+var moduleA = require("./aliasUsageInArray_moduleA");
 var xs = [moduleA];
 var xs2 = [moduleA];

tests/baselines/reference/aliasUsageInArray.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInArray_main.ts ===
-import Backbone = require("aliasUsageInArray_backbone");
+import Backbone = require("./aliasUsageInArray_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInArray_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInArray_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 56))
+import moduleA = require("./aliasUsageInArray_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 58))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInArray_main.ts, 1, 54))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInArray_main.ts, 1, 56))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInArray_main.ts, 2, 34))
@@ -17,13 +17,13 @@ interface IHasVisualizationModel {
 
 var xs: IHasVisualizationModel[] = [moduleA];
 >xs : Symbol(xs, Decl(aliasUsageInArray_main.ts, 6, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInArray_main.ts, 1, 54))
->moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 56))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInArray_main.ts, 1, 56))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 58))
 
 var xs2: typeof moduleA[] = [moduleA];
 >xs2 : Symbol(xs2, Decl(aliasUsageInArray_main.ts, 7, 3))
->moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 56))
->moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 56))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 58))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInArray_main.ts, 0, 58))
 
 === tests/cases/compiler/aliasUsageInArray_backbone.ts ===
 export class Model {
@@ -34,11 +34,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInArray_moduleA.ts ===
-import Backbone = require("aliasUsageInArray_backbone");
+import Backbone = require("./aliasUsageInArray_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInArray_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInArray_moduleA.ts, 0, 56))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInArray_moduleA.ts, 0, 58))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInArray_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInArray_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInArray_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInArray.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInArray_main.ts ===
-import Backbone = require("aliasUsageInArray_backbone");
+import Backbone = require("./aliasUsageInArray_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInArray_moduleA");
+import moduleA = require("./aliasUsageInArray_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -36,7 +36,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInArray_moduleA.ts ===
-import Backbone = require("aliasUsageInArray_backbone");
+import Backbone = require("./aliasUsageInArray_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInFunctionExpression.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInFunctionExpression_moduleA.ts]
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInFunctionExpression_main.ts]
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
-import moduleA = require("aliasUsageInFunctionExpression_moduleA");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
+import moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInFunctionExpression_backbone");
+var Backbone = require("./aliasUsageInFunctionExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -43,6 +43,6 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInFunctionExpression_main.js]
-var moduleA = require("aliasUsageInFunctionExpression_moduleA");
+var moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 var f = function (x) { return x; };
 f = function (x) { return moduleA; };

tests/baselines/reference/aliasUsageInFunctionExpression.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInFunctionExpression_main.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInFunctionExpression_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInFunctionExpression_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 69))
+import moduleA = require("./aliasUsageInFunctionExpression_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 71))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 67))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 69))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 2, 34))
@@ -17,13 +17,13 @@ interface IHasVisualizationModel {
 var f = (x: IHasVisualizationModel) => x;
 >f : Symbol(f, Decl(aliasUsageInFunctionExpression_main.ts, 5, 3))
 >x : Symbol(x, Decl(aliasUsageInFunctionExpression_main.ts, 5, 9))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 67))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 69))
 >x : Symbol(x, Decl(aliasUsageInFunctionExpression_main.ts, 5, 9))
 
 f = (x) => moduleA;
 >f : Symbol(f, Decl(aliasUsageInFunctionExpression_main.ts, 5, 3))
 >x : Symbol(x, Decl(aliasUsageInFunctionExpression_main.ts, 6, 5))
->moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 69))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 71))
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_backbone.ts ===
 export class Model {
@@ -34,11 +34,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 69))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 71))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInFunctionExpression.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInFunctionExpression_main.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInFunctionExpression_moduleA");
+import moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -37,7 +37,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInGenericFunction.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInGenericFunction_moduleA.ts]
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInGenericFunction_main.ts]
-import Backbone = require("aliasUsageInGenericFunction_backbone");
-import moduleA = require("aliasUsageInGenericFunction_moduleA");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
+import moduleA = require("./aliasUsageInGenericFunction_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInGenericFunction_backbone");
+var Backbone = require("./aliasUsageInGenericFunction_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -47,7 +47,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInGenericFunction_main.js]
-var moduleA = require("aliasUsageInGenericFunction_moduleA");
+var moduleA = require("./aliasUsageInGenericFunction_moduleA");
 function foo(x) {
     return x;
 }

tests/baselines/reference/aliasUsageInGenericFunction.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInGenericFunction_main.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInGenericFunction_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInGenericFunction_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 66))
+import moduleA = require("./aliasUsageInGenericFunction_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 68))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 64))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 66))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 2, 34))
@@ -18,7 +18,7 @@ function foo<T extends { a: IHasVisualizationModel }>(x: T) {
 >foo : Symbol(foo, Decl(aliasUsageInGenericFunction_main.ts, 4, 1))
 >T : Symbol(T, Decl(aliasUsageInGenericFunction_main.ts, 5, 13))
 >a : Symbol(a, Decl(aliasUsageInGenericFunction_main.ts, 5, 24))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 64))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 66))
 >x : Symbol(x, Decl(aliasUsageInGenericFunction_main.ts, 5, 54))
 >T : Symbol(T, Decl(aliasUsageInGenericFunction_main.ts, 5, 13))
 
@@ -29,13 +29,13 @@ var r = foo({ a: moduleA });
 >r : Symbol(r, Decl(aliasUsageInGenericFunction_main.ts, 8, 3))
 >foo : Symbol(foo, Decl(aliasUsageInGenericFunction_main.ts, 4, 1))
 >a : Symbol(a, Decl(aliasUsageInGenericFunction_main.ts, 8, 13))
->moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 66))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 68))
 
 var r2 = foo({ a: <IHasVisualizationModel>null });
 >r2 : Symbol(r2, Decl(aliasUsageInGenericFunction_main.ts, 9, 3))
 >foo : Symbol(foo, Decl(aliasUsageInGenericFunction_main.ts, 4, 1))
 >a : Symbol(a, Decl(aliasUsageInGenericFunction_main.ts, 9, 14))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 64))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 66))
 
 === tests/cases/compiler/aliasUsageInGenericFunction_backbone.ts ===
 export class Model {
@@ -46,11 +46,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 66))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 68))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInGenericFunction.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInGenericFunction_main.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInGenericFunction_moduleA");
+import moduleA = require("./aliasUsageInGenericFunction_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -52,7 +52,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInIndexerOfClass.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInIndexerOfClass_moduleA.ts]
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInIndexerOfClass_main.ts]
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
-import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
+import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -39,7 +39,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInIndexerOfClass_backbone");
+var Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -49,7 +49,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInIndexerOfClass_main.js]
-var moduleA = require("aliasUsageInIndexerOfClass_moduleA");
+var moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 var N = (function () {
     function N() {
         this.x = moduleA;

tests/baselines/reference/aliasUsageInIndexerOfClass.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInIndexerOfClass_main.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 65))
+import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 2, 34))
@@ -19,22 +19,22 @@ class N {
 
     [idx: string]: IHasVisualizationModel
 >idx : Symbol(idx, Decl(aliasUsageInIndexerOfClass_main.ts, 6, 5))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 
     x = moduleA;
 >x : Symbol(x, Decl(aliasUsageInIndexerOfClass_main.ts, 6, 41))
->moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 65))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 }
 class N2 {
 >N2 : Symbol(N2, Decl(aliasUsageInIndexerOfClass_main.ts, 8, 1))
 
     [idx: string]: typeof moduleA
 >idx : Symbol(idx, Decl(aliasUsageInIndexerOfClass_main.ts, 10, 5))
->moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 65))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 
     x: IHasVisualizationModel;
 >x : Symbol(x, Decl(aliasUsageInIndexerOfClass_main.ts, 10, 33))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 }
 === tests/cases/compiler/aliasUsageInIndexerOfClass_backbone.ts ===
 export class Model {
@@ -45,11 +45,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 65))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 67))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInIndexerOfClass.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInIndexerOfClass_main.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
+import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -45,7 +45,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInObjectLiteral.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInObjectLiteral_moduleA.ts]
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInObjectLiteral_main.ts]
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
-import moduleA = require("aliasUsageInObjectLiteral_moduleA");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
+import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInObjectLiteral_backbone");
+var Backbone = require("./aliasUsageInObjectLiteral_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -44,7 +44,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInObjectLiteral_main.js]
-var moduleA = require("aliasUsageInObjectLiteral_moduleA");
+var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 var a = { x: moduleA };
 var b = { x: moduleA };
 var c = { y: { z: moduleA } };

tests/baselines/reference/aliasUsageInObjectLiteral.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInObjectLiteral_main.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInObjectLiteral_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInObjectLiteral_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 64))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 2, 34))
@@ -17,25 +17,25 @@ interface IHasVisualizationModel {
 var a: { x: typeof moduleA } = { x: moduleA };
 >a : Symbol(a, Decl(aliasUsageInObjectLiteral_main.ts, 5, 3))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 5, 8))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 5, 32))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 var b: { x: IHasVisualizationModel } = { x: moduleA };
 >b : Symbol(b, Decl(aliasUsageInObjectLiteral_main.ts, 6, 3))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 6, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 64))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 6, 40))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
 >c : Symbol(c, Decl(aliasUsageInObjectLiteral_main.ts, 7, 3))
 >y : Symbol(y, Decl(aliasUsageInObjectLiteral_main.ts, 7, 8))
 >z : Symbol(z, Decl(aliasUsageInObjectLiteral_main.ts, 7, 13))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 64))
 >y : Symbol(y, Decl(aliasUsageInObjectLiteral_main.ts, 7, 47))
 >z : Symbol(z, Decl(aliasUsageInObjectLiteral_main.ts, 7, 52))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_backbone.ts ===
 export class Model {
@@ -46,11 +46,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 64))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 66))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInObjectLiteral.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInObjectLiteral_main.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInObjectLiteral_moduleA");
+import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -50,7 +50,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInOrExpression.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInOrExpression_moduleA.ts]
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInOrExpression_main.ts]
-import Backbone = require("aliasUsageInOrExpression_backbone");
-import moduleA = require("aliasUsageInOrExpression_moduleA");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
+import moduleA = require("./aliasUsageInOrExpression_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInOrExpression_backbone");
+var Backbone = require("./aliasUsageInOrExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -47,7 +47,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInOrExpression_main.js]
-var moduleA = require("aliasUsageInOrExpression_moduleA");
+var moduleA = require("./aliasUsageInOrExpression_moduleA");
 var i;
 var d1 = i || moduleA;
 var d2 = i || moduleA;

tests/baselines/reference/aliasUsageInOrExpression.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInOrExpression_main.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInOrExpression_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+import moduleA = require("./aliasUsageInOrExpression_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 2, 34))
@@ -16,42 +16,42 @@ interface IHasVisualizationModel {
 }
 var i: IHasVisualizationModel;
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 
 var d1 = i || moduleA;
 >d1 : Symbol(d1, Decl(aliasUsageInOrExpression_main.ts, 6, 3))
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var d2: IHasVisualizationModel = i || moduleA;
 >d2 : Symbol(d2, Decl(aliasUsageInOrExpression_main.ts, 7, 3), Decl(aliasUsageInOrExpression_main.ts, 8, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var d2: IHasVisualizationModel = moduleA || i;
 >d2 : Symbol(d2, Decl(aliasUsageInOrExpression_main.ts, 7, 3), Decl(aliasUsageInOrExpression_main.ts, 8, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
 
 var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || { x: moduleA };
 >e : Symbol(e, Decl(aliasUsageInOrExpression_main.ts, 9, 3))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 9, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 9, 41))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 9, 79))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x: moduleA } : null;
 >f : Symbol(f, Decl(aliasUsageInOrExpression_main.ts, 10, 3))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 10, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 10, 41))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 10, 78))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 === tests/cases/compiler/aliasUsageInOrExpression_backbone.ts ===
 export class Model {
@@ -62,11 +62,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 63))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 65))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInOrExpression.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInOrExpression_main.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInOrExpression_moduleA");
+import moduleA = require("./aliasUsageInOrExpression_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -74,7 +74,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts]
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInTypeArgumentOfExtendsClause_main.ts]
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
-import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -52,7 +52,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+var moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 var C = (function () {
     function C() {
     }

tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_main.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 78))
+import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 80))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 76))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 2, 34))
@@ -17,7 +17,7 @@ interface IHasVisualizationModel {
 class C<T extends IHasVisualizationModel> {
 >C : Symbol(C, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 4, 1))
 >T : Symbol(T, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 5, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 76))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     x: T;
 >x : Symbol(x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 5, 43))
@@ -26,11 +26,11 @@ class C<T extends IHasVisualizationModel> {
 class D extends C<IHasVisualizationModel> {
 >D : Symbol(D, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 7, 1))
 >C : Symbol(C, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 4, 1))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 76))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     x = moduleA;
 >x : Symbol(x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 8, 43))
->moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 78))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 80))
 }
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_backbone.ts ===
 export class Model {
@@ -41,11 +41,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 78))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 80))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_main.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -41,7 +41,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsageInVarAssignment.js

@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInVarAssignment_moduleA.ts]
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInVarAssignment_main.ts]
-import Backbone = require("aliasUsageInVarAssignment_backbone");
-import moduleA = require("aliasUsageInVarAssignment_moduleA");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
+import moduleA = require("./aliasUsageInVarAssignment_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInVarAssignment_backbone");
+var Backbone = require("./aliasUsageInVarAssignment_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {

tests/baselines/reference/aliasUsageInVarAssignment.symbols

@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInVarAssignment_main.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInVarAssignment_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInVarAssignment_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 64))
+import moduleA = require("./aliasUsageInVarAssignment_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 66))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 64))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 2, 34))
@@ -16,11 +16,11 @@ interface IHasVisualizationModel {
 }
 var i: IHasVisualizationModel;
 >i : Symbol(i, Decl(aliasUsageInVarAssignment_main.ts, 5, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 64))
 
 var m: typeof moduleA = i;
 >m : Symbol(m, Decl(aliasUsageInVarAssignment_main.ts, 6, 3))
->moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 66))
 >i : Symbol(i, Decl(aliasUsageInVarAssignment_main.ts, 5, 3))
 
 === tests/cases/compiler/aliasUsageInVarAssignment_backbone.ts ===
@@ -32,11 +32,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 64))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 66))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 0))

tests/baselines/reference/aliasUsageInVarAssignment.types

@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInVarAssignment_main.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInVarAssignment_moduleA");
+import moduleA = require("./aliasUsageInVarAssignment_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -32,7 +32,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {

tests/baselines/reference/aliasUsedAsNameValue.js

@@ -9,8 +9,8 @@ export function b(a: any): any { return null; }
 //// [aliasUsedAsNameValue_2.ts]
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-import mod = require("aliasUsedAsNameValue_0");
-import b = require("aliasUsedAsNameValue_1");
+import mod = require("./aliasUsedAsNameValue_0");
+import b = require("./aliasUsedAsNameValue_1");
  
 export var a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
@@ -25,8 +25,8 @@ exports.b = b;
 //// [aliasUsedAsNameValue_2.js]
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-var mod = require("aliasUsedAsNameValue_0");
-var b = require("aliasUsedAsNameValue_1");
+var mod = require("./aliasUsedAsNameValue_0");
+var b = require("./aliasUsedAsNameValue_1");
 exports.a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);

tests/baselines/reference/aliasUsedAsNameValue.symbols

@@ -1,11 +1,11 @@
 === tests/cases/compiler/aliasUsedAsNameValue_2.ts ===
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-import mod = require("aliasUsedAsNameValue_0");
+import mod = require("./aliasUsedAsNameValue_0");
 >mod : Symbol(mod, Decl(aliasUsedAsNameValue_2.ts, 0, 0))
 
-import b = require("aliasUsedAsNameValue_1");
->b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 47))
+import b = require("./aliasUsedAsNameValue_1");
+>b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 49))
  
 export var a = function () {
 >a : Symbol(a, Decl(aliasUsedAsNameValue_2.ts, 5, 10))
@@ -13,7 +13,7 @@ export var a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 >b.b : Symbol(b.b, Decl(aliasUsedAsNameValue_1.ts, 0, 0))
->b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 47))
+>b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 49))
 >b : Symbol(b.b, Decl(aliasUsedAsNameValue_1.ts, 0, 0))
 >mod : Symbol(mod, Decl(aliasUsedAsNameValue_2.ts, 0, 0))
 }

tests/baselines/reference/aliasUsedAsNameValue.types

@@ -1,10 +1,10 @@
 === tests/cases/compiler/aliasUsedAsNameValue_2.ts ===
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-import mod = require("aliasUsedAsNameValue_0");
+import mod = require("./aliasUsedAsNameValue_0");
 >mod : typeof mod
 
-import b = require("aliasUsedAsNameValue_1");
+import b = require("./aliasUsedAsNameValue_1");
 >b : typeof b
  
 export var a = function () {

tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.errors.txt

@@ -2,7 +2,7 @@ tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.ts
 
 
 ==== tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.ts (1 errors) ====
-    import moduleA = require("aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
+    import moduleA = require("./aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
     var d = b.q3;
             ~
 !!! error TS2304: Cannot find name 'b'.

tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js

@@ -7,7 +7,7 @@ interface c {
 export = c;
 
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.ts]
-import moduleA = require("aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
+import moduleA = require("./aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
 var d = b.q3;
 
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.js]

tests/baselines/reference/ambientEnum1.errors.txt

@@ -1,17 +1,14 @@
-tests/cases/compiler/ambientEnum1.ts(2,9): error TS1066: Ambient enum elements can only have integer literal initializers.
-tests/cases/compiler/ambientEnum1.ts(7,9): error TS1066: Ambient enum elements can only have integer literal initializers.
+tests/cases/compiler/ambientEnum1.ts(7,13): error TS1066: In ambient enum declarations member initializer must be constant expression.
 
 
-==== tests/cases/compiler/ambientEnum1.ts (2 errors) ====
+==== tests/cases/compiler/ambientEnum1.ts (1 errors) ====
         declare enum E1 {
             y = 4.23
-            ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
         }
         
         // Ambient enum with computer member
         declare enum E2 {
             x = 'foo'.length
-            ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
+                ~~~~~~~~~~~~
+!!! error TS1066: In ambient enum declarations member initializer must be constant expression.
         }

tests/baselines/reference/ambientEnumDeclaration1.errors.txt

@@ -1,24 +0,0 @@
-tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(5,5): error TS1066: Ambient enum elements can only have integer literal initializers.
-tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(6,5): error TS1066: Ambient enum elements can only have integer literal initializers.
-tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(7,5): error TS1066: Ambient enum elements can only have integer literal initializers.
-tests/cases/conformance/ambient/ambientEnumDeclaration1.ts(8,5): error TS1066: Ambient enum elements can only have integer literal initializers.
-
-
-==== tests/cases/conformance/ambient/ambientEnumDeclaration1.ts (4 errors) ====
-    // In ambient enum declarations, all values specified in enum member declarations must be classified as constant enum expressions.
-    
-    declare enum E {
-        a = 10,
-        b = 10 + 1,
-        ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
-        c = b,
-        ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
-        d = (c) + 1,
-        ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
-        e = 10 << 2 * 8,
-        ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
-    }

tests/baselines/reference/ambientEnumDeclaration1.symbols

@@ -0,0 +1,23 @@
+=== tests/cases/conformance/ambient/ambientEnumDeclaration1.ts ===
+// In ambient enum declarations, all values specified in enum member declarations must be classified as constant enum expressions.
+
+declare enum E {
+>E : Symbol(E, Decl(ambientEnumDeclaration1.ts, 0, 0))
+
+    a = 10,
+>a : Symbol(E.a, Decl(ambientEnumDeclaration1.ts, 2, 16))
+
+    b = 10 + 1,
+>b : Symbol(E.b, Decl(ambientEnumDeclaration1.ts, 3, 11))
+
+    c = b,
+>c : Symbol(E.c, Decl(ambientEnumDeclaration1.ts, 4, 15))
+>b : Symbol(E.b, Decl(ambientEnumDeclaration1.ts, 3, 11))
+
+    d = (c) + 1,
+>d : Symbol(E.d, Decl(ambientEnumDeclaration1.ts, 5, 10))
+>c : Symbol(E.c, Decl(ambientEnumDeclaration1.ts, 4, 15))
+
+    e = 10 << 2 * 8,
+>e : Symbol(E.e, Decl(ambientEnumDeclaration1.ts, 6, 16))
+}

tests/baselines/reference/ambientEnumDeclaration1.types

@@ -0,0 +1,35 @@
+=== tests/cases/conformance/ambient/ambientEnumDeclaration1.ts ===
+// In ambient enum declarations, all values specified in enum member declarations must be classified as constant enum expressions.
+
+declare enum E {
+>E : E
+
+    a = 10,
+>a : E
+>10 : number
+
+    b = 10 + 1,
+>b : E
+>10 + 1 : number
+>10 : number
+>1 : number
+
+    c = b,
+>c : E
+>b : E
+
+    d = (c) + 1,
+>d : E
+>(c) + 1 : number
+>(c) : E
+>c : E
+>1 : number
+
+    e = 10 << 2 * 8,
+>e : E
+>10 << 2 * 8 : number
+>10 : number
+>2 * 8 : number
+>2 : number
+>8 : number
+}

tests/baselines/reference/ambientEnumElementInitializer3.errors.txt

@@ -1,9 +0,0 @@
-tests/cases/compiler/ambientEnumElementInitializer3.ts(2,2): error TS1066: Ambient enum elements can only have integer literal initializers.
-
-
-==== tests/cases/compiler/ambientEnumElementInitializer3.ts (1 errors) ====
-    declare enum E {
-     e = 3.3 // Decimal
-     ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
-    }

tests/baselines/reference/ambientEnumElementInitializer3.symbols

@@ -0,0 +1,7 @@
+=== tests/cases/compiler/ambientEnumElementInitializer3.ts ===
+declare enum E {
+>E : Symbol(E, Decl(ambientEnumElementInitializer3.ts, 0, 0))
+
+ e = 3.3 // Decimal
+>e : Symbol(E.e, Decl(ambientEnumElementInitializer3.ts, 0, 16))
+}

tests/baselines/reference/ambientEnumElementInitializer3.types

@@ -0,0 +1,8 @@
+=== tests/cases/compiler/ambientEnumElementInitializer3.ts ===
+declare enum E {
+>E : E
+
+ e = 3.3 // Decimal
+>e : E
+>3.3 : number
+}

tests/baselines/reference/ambientErrors.errors.txt

@@ -1,22 +1,21 @@
 tests/cases/conformance/ambient/ambientErrors.ts(2,15): error TS1039: Initializers are not allowed in ambient contexts.
 tests/cases/conformance/ambient/ambientErrors.ts(6,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature.
 tests/cases/conformance/ambient/ambientErrors.ts(17,22): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
-tests/cases/conformance/ambient/ambientErrors.ts(20,24): error TS1184: An implementation cannot be declared in ambient contexts.
-tests/cases/conformance/ambient/ambientErrors.ts(24,5): error TS1066: Ambient enum elements can only have integer literal initializers.
-tests/cases/conformance/ambient/ambientErrors.ts(29,5): error TS1066: Ambient enum elements can only have integer literal initializers.
+tests/cases/conformance/ambient/ambientErrors.ts(20,24): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/conformance/ambient/ambientErrors.ts(29,9): error TS1066: In ambient enum declarations member initializer must be constant expression.
 tests/cases/conformance/ambient/ambientErrors.ts(34,11): error TS1039: Initializers are not allowed in ambient contexts.
-tests/cases/conformance/ambient/ambientErrors.ts(35,19): error TS1184: An implementation cannot be declared in ambient contexts.
+tests/cases/conformance/ambient/ambientErrors.ts(35,19): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/conformance/ambient/ambientErrors.ts(37,20): error TS1039: Initializers are not allowed in ambient contexts.
 tests/cases/conformance/ambient/ambientErrors.ts(38,13): error TS1039: Initializers are not allowed in ambient contexts.
-tests/cases/conformance/ambient/ambientErrors.ts(39,23): error TS1184: An implementation cannot be declared in ambient contexts.
-tests/cases/conformance/ambient/ambientErrors.ts(40,14): error TS1184: An implementation cannot be declared in ambient contexts.
-tests/cases/conformance/ambient/ambientErrors.ts(41,22): error TS1184: An implementation cannot be declared in ambient contexts.
-tests/cases/conformance/ambient/ambientErrors.ts(47,20): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/conformance/ambient/ambientErrors.ts(39,23): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/conformance/ambient/ambientErrors.ts(40,14): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/conformance/ambient/ambientErrors.ts(41,22): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/conformance/ambient/ambientErrors.ts(47,20): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
 tests/cases/conformance/ambient/ambientErrors.ts(51,16): error TS2436: Ambient module declaration cannot specify relative module name.
 tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export assignment cannot be used in a module with other exported elements.
 
 
-==== tests/cases/conformance/ambient/ambientErrors.ts (16 errors) ====
+==== tests/cases/conformance/ambient/ambientErrors.ts (15 errors) ====
     // Ambient variable with an initializer 
     declare var x = 4;
                   ~
@@ -44,20 +43,18 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export
     // Ambient function with function body
     declare function fn4() { };
                            ~
-!!! error TS1184: An implementation cannot be declared in ambient contexts.
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
     
     // Ambient enum with non - integer literal constant member
     declare enum E1 {
         y = 4.23
-        ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
     }
     
     // Ambient enum with computer member
     declare enum E2 {
         x = 'foo'.length
-        ~
-!!! error TS1066: Ambient enum elements can only have integer literal initializers.
+            ~~~~~~~~~~~~
+!!! error TS1066: In ambient enum declarations member initializer must be constant expression.
     }
     
     // Ambient module with initializers for values, bodies for functions / classes
@@ -67,7 +64,7 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export
 !!! error TS1039: Initializers are not allowed in ambient contexts.
         function fn() { }
                       ~
-!!! error TS1184: An implementation cannot be declared in ambient contexts.
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
         class C {
             static x = 3;
                        ~
@@ -77,13 +74,13 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export
 !!! error TS1039: Initializers are not allowed in ambient contexts.
             constructor() { }
                           ~
-!!! error TS1184: An implementation cannot be declared in ambient contexts.
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
             fn() { }
                  ~
-!!! error TS1184: An implementation cannot be declared in ambient contexts.
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
             static sfn() { }
                          ~
-!!! error TS1184: An implementation cannot be declared in ambient contexts.
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
         }
     }
     
@@ -91,7 +88,7 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export
     module M2 {
         declare module 'nope' { }
                        ~~~~~~
-!!! error TS2435: Ambient modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
     }
     
     // Ambient external module with a string literal name that isn't a top level external module name

tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(5,16): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
 tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): error TS2307: Cannot find module 'ext'.
 
 
@@ -9,7 +9,7 @@ tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(10,22): err
     
     declare module "ext" {
                    ~~~~~
-!!! error TS2435: Ambient modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
         export class C { }
     }
     

tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt

@@ -1,9 +1,9 @@
-tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,27): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts(2,27): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
 
 
 ==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts (1 errors) ====
     module M {
         export declare module "M" { }
                               ~~~
-!!! error TS2435: Ambient modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.
     }

tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2435: Ambient modules cannot be nested in other modules.
+tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2435: Ambient modules cannot be nested in other modules or namespaces.
 
 
 ==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts (1 errors) ====
     export declare module "M" { }
                           ~~~
-!!! error TS2435: Ambient modules cannot be nested in other modules.
+!!! error TS2435: Ambient modules cannot be nested in other modules or namespaces.

tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.types

@@ -31,7 +31,7 @@ class TestClass {
         this.bar(x); // should not error
 >this.bar(x) : void
 >this.bar : { (x: string): void; (x: string[]): void; }
->this : TestClass
+>this : this
 >bar : { (x: string): void; (x: string[]): void; }
 >x : any
     }
@@ -71,7 +71,7 @@ class TestClass2 {
         return this.bar(x); // should not error
 >this.bar(x) : number
 >this.bar : { (x: string): number; (x: string[]): number; }
->this : TestClass2
+>this : this
 >bar : { (x: string): number; (x: string[]): number; }
 >x : any
     }

tests/baselines/reference/amdModuleName1.types

@@ -10,7 +10,7 @@ class Foo {
         this.x = 5;
 >this.x = 5 : number
 >this.x : number
->this : Foo
+>this : this
 >x : number
 >5 : number
     }

tests/baselines/reference/arityAndOrderCompatibility01.errors.txt

@@ -34,6 +34,8 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2322: Type 'StrNum' is not assignable to type '[string]'.
   Types of property 'pop' are incompatible.
     Type '() => string | number' is not assignable to type '() => string'.
+      Type 'string | number' is not assignable to type 'string'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(27,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.
   Property 'length' is missing in type '{ 0: string; 1: number; }'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(28,5): error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
@@ -125,6 +127,8 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
 !!! error TS2322: Type 'StrNum' is not assignable to type '[string]'.
 !!! error TS2322:   Types of property 'pop' are incompatible.
 !!! error TS2322:     Type '() => string | number' is not assignable to type '() => string'.
+!!! error TS2322:       Type 'string | number' is not assignable to type 'string'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     var m3: [string] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.

tests/baselines/reference/arrayBestCommonTypes.types

@@ -51,7 +51,7 @@ module EmptyTypes {
 >(this.voidIfAny([4, 2][0])) : number
 >this.voidIfAny([4, 2][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2][0] : number
 >[4, 2] : number[]
@@ -64,7 +64,7 @@ module EmptyTypes {
 >(this.voidIfAny([4, 2, undefined][0])) : number
 >this.voidIfAny([4, 2, undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2, undefined][0] : number
 >[4, 2, undefined] : number[]
@@ -78,7 +78,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, 2, 4][0])) : number
 >this.voidIfAny([undefined, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 2, 4][0] : number
 >[undefined, 2, 4] : number[]
@@ -92,7 +92,7 @@ module EmptyTypes {
 >(this.voidIfAny([null, 2, 4][0])) : number
 >this.voidIfAny([null, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, 2, 4][0] : number
 >[null, 2, 4] : number[]
@@ -106,7 +106,7 @@ module EmptyTypes {
 >(this.voidIfAny([2, 4, null][0])) : number
 >this.voidIfAny([2, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[2, 4, null][0] : number
 >[2, 4, null] : number[]
@@ -120,7 +120,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, 4, null][0])) : number
 >this.voidIfAny([undefined, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 4, null][0] : number
 >[undefined, 4, null] : number[]
@@ -134,7 +134,7 @@ module EmptyTypes {
 >(this.voidIfAny(['', "q"][0])) : number
 >this.voidIfAny(['', "q"][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q"][0] : string
 >['', "q"] : string[]
@@ -147,7 +147,7 @@ module EmptyTypes {
 >(this.voidIfAny(['', "q", undefined][0])) : number
 >this.voidIfAny(['', "q", undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q", undefined][0] : string
 >['', "q", undefined] : string[]
@@ -161,7 +161,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, "q", ''][0])) : number
 >this.voidIfAny([undefined, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, "q", ''][0] : string
 >[undefined, "q", ''] : string[]
@@ -175,7 +175,7 @@ module EmptyTypes {
 >(this.voidIfAny([null, "q", ''][0])) : number
 >this.voidIfAny([null, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, "q", ''][0] : string
 >[null, "q", ''] : string[]
@@ -189,7 +189,7 @@ module EmptyTypes {
 >(this.voidIfAny(["q", '', null][0])) : number
 >this.voidIfAny(["q", '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >["q", '', null][0] : string
 >["q", '', null] : string[]
@@ -203,7 +203,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, '', null][0])) : number
 >this.voidIfAny([undefined, '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, '', null][0] : string
 >[undefined, '', null] : string[]
@@ -217,7 +217,7 @@ module EmptyTypes {
 >(this.voidIfAny([[3, 4], [null]][0][0])) : number
 >this.voidIfAny([[3, 4], [null]][0][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[[3, 4], [null]][0][0] : number
 >[[3, 4], [null]][0] : number[]
@@ -454,7 +454,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([4, 2][0])) : number
 >this.voidIfAny([4, 2][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2][0] : number
 >[4, 2] : number[]
@@ -467,7 +467,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([4, 2, undefined][0])) : number
 >this.voidIfAny([4, 2, undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2, undefined][0] : number
 >[4, 2, undefined] : number[]
@@ -481,7 +481,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, 2, 4][0])) : number
 >this.voidIfAny([undefined, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 2, 4][0] : number
 >[undefined, 2, 4] : number[]
@@ -495,7 +495,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([null, 2, 4][0])) : number
 >this.voidIfAny([null, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, 2, 4][0] : number
 >[null, 2, 4] : number[]
@@ -509,7 +509,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([2, 4, null][0])) : number
 >this.voidIfAny([2, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[2, 4, null][0] : number
 >[2, 4, null] : number[]
@@ -523,7 +523,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, 4, null][0])) : number
 >this.voidIfAny([undefined, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 4, null][0] : number
 >[undefined, 4, null] : number[]
@@ -537,7 +537,7 @@ module NonEmptyTypes {
 >(this.voidIfAny(['', "q"][0])) : number
 >this.voidIfAny(['', "q"][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q"][0] : string
 >['', "q"] : string[]
@@ -550,7 +550,7 @@ module NonEmptyTypes {
 >(this.voidIfAny(['', "q", undefined][0])) : number
 >this.voidIfAny(['', "q", undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q", undefined][0] : string
 >['', "q", undefined] : string[]
@@ -564,7 +564,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, "q", ''][0])) : number
 >this.voidIfAny([undefined, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, "q", ''][0] : string
 >[undefined, "q", ''] : string[]
@@ -578,7 +578,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([null, "q", ''][0])) : number
 >this.voidIfAny([null, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, "q", ''][0] : string
 >[null, "q", ''] : string[]
@@ -592,7 +592,7 @@ module NonEmptyTypes {
 >(this.voidIfAny(["q", '', null][0])) : number
 >this.voidIfAny(["q", '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >["q", '', null][0] : string
 >["q", '', null] : string[]
@@ -606,7 +606,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, '', null][0])) : number
 >this.voidIfAny([undefined, '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, '', null][0] : string
 >[undefined, '', null] : string[]
@@ -620,7 +620,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([[3, 4], [null]][0][0])) : number
 >this.voidIfAny([[3, 4], [null]][0][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[[3, 4], [null]][0][0] : number
 >[[3, 4], [null]][0] : number[]

tests/baselines/reference/arrayLiterals2ES6.symbols

@@ -72,14 +72,14 @@ var temp2: [number[], string[]] = [[1, 2, 3], ["hello", "string"]];
 
 interface myArray extends Array<Number> { }
 >myArray : Symbol(myArray, Decl(arrayLiterals2ES6.ts, 40, 67))
->Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(lib.d.ts, 4091, 1))
+>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(lib.d.ts, 4118, 1))
 >Number : Symbol(Number, Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
 
 interface myArray2 extends Array<Number|String> { }
 >myArray2 : Symbol(myArray2, Decl(arrayLiterals2ES6.ts, 42, 43))
->Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(lib.d.ts, 4091, 1))
+>Array : Symbol(Array, Decl(lib.d.ts, 1000, 23), Decl(lib.d.ts, 1171, 11), Decl(lib.d.ts, 4118, 1))
 >Number : Symbol(Number, Decl(lib.d.ts, 456, 40), Decl(lib.d.ts, 518, 11))
->String : Symbol(String, Decl(lib.d.ts, 275, 1), Decl(lib.d.ts, 443, 11), Decl(lib.d.ts, 4209, 1))
+>String : Symbol(String, Decl(lib.d.ts, 275, 1), Decl(lib.d.ts, 443, 11), Decl(lib.d.ts, 4236, 1))
 
 var d0 = [1, true, ...temp, ];  // has type (string|number|boolean)[]
 >d0 : Symbol(d0, Decl(arrayLiterals2ES6.ts, 44, 3))

tests/baselines/reference/arrayOfExportedClass.js

@@ -9,7 +9,7 @@ export = Car;
 
 //// [arrayOfExportedClass_1.ts]
 ///<reference path='arrayOfExportedClass_0.ts'/>
-import Car = require('arrayOfExportedClass_0');
+import Car = require('./arrayOfExportedClass_0');
 
 class Road {
 

tests/baselines/reference/arrayOfExportedClass.symbols

@@ -1,10 +1,10 @@
 === tests/cases/compiler/arrayOfExportedClass_1.ts ===
 ///<reference path='arrayOfExportedClass_0.ts'/>
-import Car = require('arrayOfExportedClass_0');
+import Car = require('./arrayOfExportedClass_0');
 >Car : Symbol(Car, Decl(arrayOfExportedClass_1.ts, 0, 0))
 
 class Road {
->Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 47))
+>Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
 
     public cars: Car[];
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
@@ -17,14 +17,14 @@ class Road {
 
         this.cars = cars;
 >this.cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
->this : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 47))
+>this : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 7, 19))
     }
 }
 
 export = Road;
->Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 47))
+>Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
 
 === tests/cases/compiler/arrayOfExportedClass_0.ts ===
 class Car {

tests/baselines/reference/arrayOfExportedClass.types

@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayOfExportedClass_1.ts ===
 ///<reference path='arrayOfExportedClass_0.ts'/>
-import Car = require('arrayOfExportedClass_0');
+import Car = require('./arrayOfExportedClass_0');
 >Car : typeof Car
 
 class Road {
@@ -18,7 +18,7 @@ class Road {
         this.cars = cars;
 >this.cars = cars : Car[]
 >this.cars : Car[]
->this : Road
+>this : this
 >cars : Car[]
 >cars : Car[]
     }

tests/baselines/reference/arrayconcat.types

@@ -38,12 +38,12 @@ class parser {
 		this.options = this.options.sort(function(a, b) {
 >this.options = this.options.sort(function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        }) : IOptions[]
 >this.options : IOptions[]
->this : parser
+>this : this
 >options : IOptions[]
 >this.options.sort(function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        }) : IOptions[]
 >this.options.sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[]
 >this.options : IOptions[]
->this : parser
+>this : this
 >options : IOptions[]
 >sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[]
 >function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        } : (a: IOptions, b: IOptions) => number

tests/baselines/reference/arrowFunctionExpressions.types

@@ -100,12 +100,12 @@ var p8 = ({ a = 1 }) => { };
 >1 : number
 
 var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
->p9 : ({ a: { b = 1 } = { b: 1 } }: { a?: { b: number; }; }) => void
->({ a: { b = 1 } = { b: 1 } }) => { } : ({ a: { b = 1 } = { b: 1 } }: { a?: { b: number; }; }) => void
+>p9 : ({ a: { b = 1 } = { b: 1 } }: { a?: { b?: number; }; }) => void
+>({ a: { b = 1 } = { b: 1 } }) => { } : ({ a: { b = 1 } = { b: 1 } }: { a?: { b?: number; }; }) => void
 >a : any
 >b : number
 >1 : number
->{ b: 1 } : { b: number; }
+>{ b: 1 } : { b?: number; }
 >b : number
 >1 : number
 
@@ -129,12 +129,12 @@ class MyClass {
 >1 : number
 
     p = (n) => n && this;
->p : (n: any) => MyClass
->(n) => n && this : (n: any) => MyClass
+>p : (n: any) => this
+>(n) => n && this : (n: any) => this
 >n : any
->n && this : MyClass
+>n && this : this
 >n : any
->this : MyClass
+>this : this
 
     fn() {
 >fn : () => void
@@ -148,12 +148,12 @@ class MyClass {
 >1 : number
 
         var p = (n) => n && this;
->p : (n: any) => MyClass
->(n) => n && this : (n: any) => MyClass
+>p : (n: any) => this
+>(n) => n && this : (n: any) => this
 >n : any
->n && this : MyClass
+>n && this : this
 >n : any
->this : MyClass
+>this : this
     }
 }
 

tests/baselines/reference/asOperator4.js

@@ -0,0 +1,22 @@
+//// [tests/cases/conformance/expressions/asOperator/asOperator4.ts] ////
+
+//// [foo.ts]
+
+export function foo() { }
+
+//// [bar.ts]
+import { foo } from './foo';
+
+// These should emit identically
+<any>foo;
+(foo as any);
+
+
+//// [foo.js]
+function foo() { }
+exports.foo = foo;
+//// [bar.js]
+var foo_1 = require('./foo');
+// These should emit identically
+foo_1.foo;
+foo_1.foo;

tests/baselines/reference/asOperator4.symbols

@@ -0,0 +1,16 @@
+=== tests/cases/conformance/expressions/asOperator/foo.ts ===
+
+export function foo() { }
+>foo : Symbol(foo, Decl(foo.ts, 0, 0))
+
+=== tests/cases/conformance/expressions/asOperator/bar.ts ===
+import { foo } from './foo';
+>foo : Symbol(foo, Decl(bar.ts, 0, 8))
+
+// These should emit identically
+<any>foo;
+>foo : Symbol(foo, Decl(bar.ts, 0, 8))
+
+(foo as any);
+>foo : Symbol(foo, Decl(bar.ts, 0, 8))
+

tests/baselines/reference/asOperator4.types

@@ -0,0 +1,19 @@
+=== tests/cases/conformance/expressions/asOperator/foo.ts ===
+
+export function foo() { }
+>foo : () => void
+
+=== tests/cases/conformance/expressions/asOperator/bar.ts ===
+import { foo } from './foo';
+>foo : () => void
+
+// These should emit identically
+<any>foo;
+><any>foo : any
+>foo : () => void
+
+(foo as any);
+>(foo as any) : any
+>foo as any : any
+>foo : () => void
+

tests/baselines/reference/asyncArrowFunction1_es6.symbols

@@ -2,6 +2,6 @@
 
 var foo = async (): Promise<void> => {
 >foo : Symbol(foo, Decl(asyncArrowFunction1_es6.ts, 1, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 };

tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.types

@@ -11,11 +11,12 @@ class C {
       var fn = async () => await other.apply(this, arguments);      
 >fn : () => Promise<any>
 >async () => await other.apply(this, arguments) : () => Promise<any>
+>await other.apply(this, arguments) : any
 >other.apply(this, arguments) : any
 >other.apply : (thisArg: any, argArray?: any) => any
 >other : () => void
 >apply : (thisArg: any, argArray?: any) => any
->this : C
+>this : this
 >arguments : IArguments
    }
 }

tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.types

@@ -6,9 +6,10 @@ class C {
 >method : () => void
 
       var fn = async () => await this;      
->fn : () => Promise<C>
->async () => await this : () => Promise<C>
->this : C
+>fn : () => Promise<this>
+>async () => await this : () => Promise<this>
+>await this : this
+>this : this
    }
 }
 

tests/baselines/reference/asyncAwait_es6.symbols

@@ -2,16 +2,16 @@
 type MyPromise<T> = Promise<T>;
 >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11))
 >T : Symbol(T, Decl(asyncAwait_es6.ts, 0, 15))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >T : Symbol(T, Decl(asyncAwait_es6.ts, 0, 15))
 
 declare var MyPromise: typeof Promise;
 >MyPromise : Symbol(MyPromise, Decl(asyncAwait_es6.ts, 0, 0), Decl(asyncAwait_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare var p: Promise<number>;
 >p : Symbol(p, Decl(asyncAwait_es6.ts, 2, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare var mp: MyPromise<number>;
 >mp : Symbol(mp, Decl(asyncAwait_es6.ts, 3, 11))
@@ -22,7 +22,7 @@ async function f0() { }
 
 async function f1(): Promise<void> { }
 >f1 : Symbol(f1, Decl(asyncAwait_es6.ts, 5, 23))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 async function f3(): MyPromise<void> { }
 >f3 : Symbol(f3, Decl(asyncAwait_es6.ts, 6, 38))
@@ -33,7 +33,7 @@ let f4 = async function() { }
 
 let f5 = async function(): Promise<void> { }
 >f5 : Symbol(f5, Decl(asyncAwait_es6.ts, 10, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : Symbol(f6, Decl(asyncAwait_es6.ts, 11, 3))
@@ -44,7 +44,7 @@ let f7 = async () => { };
 
 let f8 = async (): Promise<void> => { };
 >f8 : Symbol(f8, Decl(asyncAwait_es6.ts, 14, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : Symbol(f9, Decl(asyncAwait_es6.ts, 15, 3))
@@ -60,7 +60,7 @@ let f11 = async () => mp;
 
 let f12 = async (): Promise<number> => mp;
 >f12 : Symbol(f12, Decl(asyncAwait_es6.ts, 18, 3))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >mp : Symbol(mp, Decl(asyncAwait_es6.ts, 3, 11))
 
 let f13 = async (): MyPromise<number> => p;
@@ -76,7 +76,7 @@ let o = {
 
 	async m2(): Promise<void> { },
 >m2 : Symbol(m2, Decl(asyncAwait_es6.ts, 22, 16))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 	async m3(): MyPromise<void> { }
 >m3 : Symbol(m3, Decl(asyncAwait_es6.ts, 23, 31))
@@ -92,7 +92,7 @@ class C {
 
 	async m2(): Promise<void> { }
 >m2 : Symbol(m2, Decl(asyncAwait_es6.ts, 28, 15))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 	async m3(): MyPromise<void> { }
 >m3 : Symbol(m3, Decl(asyncAwait_es6.ts, 29, 30))
@@ -103,7 +103,7 @@ class C {
 
 	static async m5(): Promise<void> { }
 >m5 : Symbol(C.m5, Decl(asyncAwait_es6.ts, 31, 22))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 	static async m6(): MyPromise<void> { }
 >m6 : Symbol(C.m6, Decl(asyncAwait_es6.ts, 32, 37))

tests/baselines/reference/asyncFunctionDeclaration11_es6.symbols

@@ -1,5 +1,5 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration11_es6.ts ===
 async function await(): Promise<void> {
 >await : Symbol(await, Decl(asyncFunctionDeclaration11_es6.ts, 0, 0))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 }

tests/baselines/reference/asyncFunctionDeclaration14_es6.symbols

@@ -1,7 +1,7 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration14_es6.ts ===
 async function foo(): Promise<void> {
 >foo : Symbol(foo, Decl(asyncFunctionDeclaration14_es6.ts, 0, 0))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
   return;
 }

tests/baselines/reference/asyncFunctionDeclaration1_es6.symbols

@@ -1,5 +1,5 @@
 === tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1_es6.ts ===
 async function foo(): Promise<void> {
 >foo : Symbol(foo, Decl(asyncFunctionDeclaration1_es6.ts, 0, 0))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 }

tests/baselines/reference/awaitBinaryExpression1_es6.symbols

@@ -4,15 +4,16 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitBinaryExpression1_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = await p || a;
 >b : Symbol(b, Decl(awaitBinaryExpression1_es6.ts, 4, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression1_es6.ts, 0, 11))
 
     "after";

tests/baselines/reference/awaitBinaryExpression1_es6.types

@@ -16,7 +16,8 @@ async function func(): Promise<void> {
     var b = await p || a;
 >b : boolean
 >await p || a : boolean
->p : any
+>await p : boolean
+>p : Promise<boolean>
 >a : boolean
 
     "after";

tests/baselines/reference/awaitBinaryExpression2_es6.symbols

@@ -4,15 +4,16 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitBinaryExpression2_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = await p && a;
 >b : Symbol(b, Decl(awaitBinaryExpression2_es6.ts, 4, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression2_es6.ts, 0, 11))
 
     "after";

tests/baselines/reference/awaitBinaryExpression2_es6.types

@@ -16,7 +16,8 @@ async function func(): Promise<void> {
     var b = await p && a;
 >b : boolean
 >await p && a : boolean
->p : any
+>await p : boolean
+>p : Promise<boolean>
 >a : boolean
 
     "after";

tests/baselines/reference/awaitBinaryExpression3_es6.symbols

@@ -4,15 +4,16 @@ declare var a: number;
 
 declare var p: Promise<number>;
 >p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitBinaryExpression3_es6.ts, 1, 31))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = await p + a;
 >b : Symbol(b, Decl(awaitBinaryExpression3_es6.ts, 4, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression3_es6.ts, 0, 11))
 
     "after";

tests/baselines/reference/awaitBinaryExpression3_es6.types

@@ -16,7 +16,8 @@ async function func(): Promise<void> {
     var b = await p + a;
 >b : number
 >await p + a : number
->p : any
+>await p : number
+>p : Promise<number>
 >a : number
 
     "after";

tests/baselines/reference/awaitBinaryExpression4_es6.symbols

@@ -4,15 +4,16 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitBinaryExpression4_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = await p, a;
 >b : Symbol(b, Decl(awaitBinaryExpression4_es6.ts, 4, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression4_es6.ts, 4, 20))
 
     "after";

tests/baselines/reference/awaitBinaryExpression4_es6.types

@@ -15,7 +15,8 @@ async function func(): Promise<void> {
 
     var b = await p, a;
 >b : boolean
->p : any
+>await p : boolean
+>p : Promise<boolean>
 >a : any
 
     "after";

tests/baselines/reference/awaitBinaryExpression5_es6.symbols

@@ -4,11 +4,11 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitBinaryExpression5_es6.ts, 1, 32))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var o: { a: boolean; };
@@ -19,6 +19,7 @@ async function func(): Promise<void> {
 >o.a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
 >o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 4, 7))
 >a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
+>p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11))
 
     "after";
 }

tests/baselines/reference/awaitBinaryExpression5_es6.types

@@ -22,7 +22,8 @@ async function func(): Promise<void> {
 >o.a : boolean
 >o : { a: boolean; }
 >a : boolean
->p : any
+>await p : boolean
+>p : Promise<boolean>
 
     "after";
 >"after" : string

tests/baselines/reference/awaitCallExpression1_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression1_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression1_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression1_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression1_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression1_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression1_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = fn(a, a, a);

tests/baselines/reference/awaitCallExpression2_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression2_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression2_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression2_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression2_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression2_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 5, 43))
@@ -36,12 +36,13 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression2_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = fn(await p, a, a);
 >b : Symbol(b, Decl(awaitCallExpression2_es6.ts, 8, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 1, 32))
+>p : Symbol(p, Decl(awaitCallExpression2_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression2_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression2_es6.ts, 0, 11))
 

tests/baselines/reference/awaitCallExpression2_es6.types

@@ -45,7 +45,8 @@ async function func(): Promise<void> {
 >b : void
 >fn(await p, a, a) : void
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
->p : any
+>await p : boolean
+>p : Promise<boolean>
 >a : boolean
 >a : boolean
 

tests/baselines/reference/awaitCallExpression3_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression3_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression3_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression3_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression3_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression3_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 5, 43))
@@ -36,13 +36,14 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression3_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = fn(a, await p, a);
 >b : Symbol(b, Decl(awaitCallExpression3_es6.ts, 8, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 1, 32))
 >a : Symbol(a, Decl(awaitCallExpression3_es6.ts, 0, 11))
+>p : Symbol(p, Decl(awaitCallExpression3_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression3_es6.ts, 0, 11))
 
     "after";

tests/baselines/reference/awaitCallExpression3_es6.types

@@ -46,7 +46,8 @@ async function func(): Promise<void> {
 >fn(a, await p, a) : void
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >a : boolean
->p : any
+>await p : boolean
+>p : Promise<boolean>
 >a : boolean
 
     "after";

tests/baselines/reference/awaitCallExpression4_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression4_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression4_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression4_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression4_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression4_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression4_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression4_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 5, 43))
@@ -36,11 +36,12 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression4_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = (await pfn)(a, a, a);
 >b : Symbol(b, Decl(awaitCallExpression4_es6.ts, 8, 7))
+>pfn : Symbol(pfn, Decl(awaitCallExpression4_es6.ts, 4, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))

tests/baselines/reference/awaitCallExpression4_es6.types

@@ -45,7 +45,8 @@ async function func(): Promise<void> {
 >b : void
 >(await pfn)(a, a, a) : void
 >(await pfn) : (arg0: boolean, arg1: boolean, arg2: boolean) => void
->pfn : any
+>await pfn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
+>pfn : Promise<(arg0: boolean, arg1: boolean, arg2: boolean) => void>
 >a : boolean
 >a : boolean
 >a : boolean

tests/baselines/reference/awaitCallExpression5_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression5_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression5_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression5_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression5_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression5_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression5_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = o.fn(a, a, a);

tests/baselines/reference/awaitCallExpression6_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression6_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression6_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression6_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression6_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression6_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression6_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = o.fn(await p, a, a);
@@ -44,6 +44,7 @@ async function func(): Promise<void> {
 >o.fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 3, 16))
 >o : Symbol(o, Decl(awaitCallExpression6_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 3, 16))
+>p : Symbol(p, Decl(awaitCallExpression6_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression6_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression6_es6.ts, 0, 11))
 

tests/baselines/reference/awaitCallExpression6_es6.types

@@ -47,7 +47,8 @@ async function func(): Promise<void> {
 >o.fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
->p : any
+>await p : boolean
+>p : Promise<boolean>
 >a : boolean
 >a : boolean
 

tests/baselines/reference/awaitCallExpression7_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression7_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression7_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression7_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression7_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression7_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 5, 43))
@@ -36,7 +36,7 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression7_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = o.fn(a, await p, a);
@@ -45,6 +45,7 @@ async function func(): Promise<void> {
 >o : Symbol(o, Decl(awaitCallExpression7_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 3, 16))
 >a : Symbol(a, Decl(awaitCallExpression7_es6.ts, 0, 11))
+>p : Symbol(p, Decl(awaitCallExpression7_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression7_es6.ts, 0, 11))
 
     "after";

tests/baselines/reference/awaitCallExpression7_es6.types

@@ -48,7 +48,8 @@ async function func(): Promise<void> {
 >o : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >a : boolean
->p : any
+>await p : boolean
+>p : Promise<boolean>
 >a : boolean
 
     "after";

tests/baselines/reference/awaitCallExpression8_es6.symbols

@@ -4,7 +4,7 @@ declare var a: boolean;
 
 declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitCallExpression8_es6.ts, 1, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
 declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 1, 32))
@@ -21,14 +21,14 @@ declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >pfn : Symbol(pfn, Decl(awaitCallExpression8_es6.ts, 4, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es6.ts, 4, 28))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 4, 42))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression8_es6.ts, 4, 57))
 
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 >po : Symbol(po, Decl(awaitCallExpression8_es6.ts, 5, 11))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
 >arg0 : Symbol(arg0, Decl(awaitCallExpression8_es6.ts, 5, 29))
 >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 5, 43))
@@ -36,12 +36,13 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 
 async function func(): Promise<void> {
 >func : Symbol(func, Decl(awaitCallExpression8_es6.ts, 5, 84))
->Promise : Symbol(Promise, Decl(lib.d.ts, 5041, 1), Decl(lib.d.ts, 5127, 11))
+>Promise : Symbol(Promise, Decl(lib.d.ts, 5068, 1), Decl(lib.d.ts, 5154, 11))
 
     "before";
     var b = (await po).fn(a, a, a);
 >b : Symbol(b, Decl(awaitCallExpression8_es6.ts, 8, 7))
 >(await po).fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
+>po : Symbol(po, Decl(awaitCallExpression8_es6.ts, 5, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
 >a : Symbol(a, Decl(awaitCallExpression8_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression8_es6.ts, 0, 11))

tests/baselines/reference/awaitCallExpression8_es6.types

@@ -46,7 +46,8 @@ async function func(): Promise<void> {
 >(await po).fn(a, a, a) : void
 >(await po).fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >(await po) : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
->po : any
+>await po : { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }
+>po : Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>
 >fn : (arg0: boolean, arg1: boolean, arg2: boolean) => void
 >a : boolean
 >a : boolean

tests/baselines/reference/awaitUnion_es6.symbols

@@ -24,16 +24,21 @@ async function f() {
 
 	let await_a = await a;
 >await_a : Symbol(await_a, Decl(awaitUnion_es6.ts, 6, 4))
+>a : Symbol(a, Decl(awaitUnion_es6.ts, 0, 11))
 
 	let await_b = await b;
 >await_b : Symbol(await_b, Decl(awaitUnion_es6.ts, 7, 4))
+>b : Symbol(b, Decl(awaitUnion_es6.ts, 1, 11))
 
 	let await_c = await c;
 >await_c : Symbol(await_c, Decl(awaitUnion_es6.ts, 8, 4))
+>c : Symbol(c, Decl(awaitUnion_es6.ts, 2, 11))
 
 	let await_d = await d;
 >await_d : Symbol(await_d, Decl(awaitUnion_es6.ts, 9, 4))
+>d : Symbol(d, Decl(awaitUnion_es6.ts, 3, 11))
 
 	let await_e = await e; 
 >await_e : Symbol(await_e, Decl(awaitUnion_es6.ts, 10, 4))
+>e : Symbol(e, Decl(awaitUnion_es6.ts, 4, 11))
 }

tests/baselines/reference/awaitUnion_es6.types

@@ -24,21 +24,26 @@ async function f() {
 
 	let await_a = await a;
 >await_a : number | string
->a : any
+>await a : number | string
+>a : number | string
 
 	let await_b = await b;
 >await_b : number | string
->b : any
+>await b : number | string
+>b : PromiseLike<number> | PromiseLike<string>
 
 	let await_c = await c;
 >await_c : number | string
->c : any
+>await c : number | string
+>c : PromiseLike<number | string>
 
 	let await_d = await d;
 >await_d : number | string
->d : any
+>await d : number | string
+>d : number | PromiseLike<string>
 
 	let await_e = await e; 
 >await_e : number | string
->e : any
+>await e : number | string
+>e : number | PromiseLike<number | string>
 }

tests/baselines/reference/badThisBinding.types

@@ -22,8 +22,8 @@ class Greeter {
 >() => {                var x = this;			} : () => void
 
                 var x = this;
->x : Greeter
->this : Greeter
+>x : this
+>this : this
 
 			});
 		});

tests/baselines/reference/baseTypeWrappingInstantiationChain.types

@@ -13,7 +13,7 @@ class C<T1> extends CBase<T1> {
 >CBaseBase : typeof CBaseBase
 >Wrapper : Wrapper<T5>
 >T1 : T1
->this : C<T1>
+>this : this
     }
     public alsoWorks() {
 >alsoWorks : () => void
@@ -22,7 +22,7 @@ class C<T1> extends CBase<T1> {
 >new CBase<T1>(this) : CBase<T1>
 >CBase : typeof CBase
 >T1 : T1
->this : C<T1>
+>this : this
     }
 
     public method(t: Wrapper<T1>) { }

tests/baselines/reference/binopAssignmentShouldHaveType.types

@@ -32,7 +32,7 @@ module Test {
 >name : string
 >this.getName() : string
 >this.getName : () => string
->this : Bug
+>this : this
 >getName : () => string
 >length : number
 >0 : number

tests/baselines/reference/callWithSpread.types

@@ -180,7 +180,7 @@ class C {
         this.foo(x, y);
 >this.foo(x, y) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number
@@ -188,7 +188,7 @@ class C {
         this.foo(x, y, ...z);
 >this.foo(x, y, ...z) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number

tests/baselines/reference/callWithSpreadES6.symbols

@@ -94,7 +94,7 @@ xa[1].foo(1, 2, ...a, "abc");
 >a : Symbol(a, Decl(callWithSpreadES6.ts, 8, 3))
 
 (<Function>xa[1].foo)(...[1, 2, "abc"]);
->Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(lib.d.ts, 4009, 1))
+>Function : Symbol(Function, Decl(lib.d.ts, 223, 38), Decl(lib.d.ts, 269, 11), Decl(lib.d.ts, 4036, 1))
 >xa[1].foo : Symbol(X.foo, Decl(callWithSpreadES6.ts, 1, 13))
 >xa : Symbol(xa, Decl(callWithSpreadES6.ts, 11, 3))
 >foo : Symbol(X.foo, Decl(callWithSpreadES6.ts, 1, 13))

tests/baselines/reference/callWithSpreadES6.types

@@ -181,7 +181,7 @@ class C {
         this.foo(x, y);
 >this.foo(x, y) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number
@@ -189,7 +189,7 @@ class C {
         this.foo(x, y, ...z);
 >this.foo(x, y, ...z) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number

tests/baselines/reference/captureThisInSuperCall.types

@@ -18,7 +18,7 @@ class B extends A {
 >() => this.someMethod() : () => void
 >this.someMethod() : void
 >this.someMethod : () => void
->this : B
+>this : this
 >someMethod : () => void
 
     someMethod() {}