Merge branch 'master' into tupleTypes

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js

@@ -53,11 +53,11 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         function Origin() {
             return "";
         }
         Point.Origin = Origin; //expected duplicate identifier error
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js

@@ -52,10 +52,10 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         function Origin() {
             return "";
         } // not an error since not exported
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js

@@ -46,8 +46,8 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         Point.Origin = ""; //expected duplicate identifier error
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js

@@ -46,8 +46,8 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var Point;
     (function (Point) {
         var Origin = ""; // not an error since not exported
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js

@@ -43,6 +43,7 @@ var a: { id: string };
 //// [class.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
         var Point = (function () {
             function Point(x, y) {
@@ -52,19 +53,18 @@ var X;
             return Point;
         })();
         Y.Point = Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [module.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Point;
         (function (Point) {
             Point.Origin = new Point(0, 0);
-        })(Y.Point || (Y.Point = {}));
-        var Point = Y.Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Point = Y.Point || (Y.Point = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [test.js]
 //var cl: { x: number; y: number; }

tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js

@@ -31,6 +31,7 @@ var A;
         return Point;
     })();
     A.Point = Point;
+    var B;
     (function (B) {
         B.Origin = new Point(0, 0);
         var Line = (function () {
@@ -42,6 +43,5 @@ var A;
             return Line;
         })();
         B.Line = Line;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));

tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js

@@ -54,10 +54,10 @@ var A;
 //// [module.js]
 var A;
 (function (A) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));
 //// [test.js]
 var fn;
@@ -72,10 +72,10 @@ var B;
         return { x: 0, y: 0 };
     }
     B.Point = Point;
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(B.Point || (B.Point = {}));
-    var Point = B.Point;
+    })(Point = B.Point || (B.Point = {}));
 })(B || (B = {}));
 var fn;
 var fn = B.Point; // not expected to be an error. bug 840000: [corelang] Function of fundule not assignalbe as expected

tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.js

@@ -33,10 +33,10 @@ var A;
 //// [module.js]
 var B;
 (function (B) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(B.Point || (B.Point = {}));
-    var Point = B.Point;
+    })(Point = B.Point || (B.Point = {}));
 })(B || (B = {}));
 //// [test.js]
 var fn;

tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js

@@ -34,17 +34,18 @@ class A {
 //// [module.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Point;
         (function (Point) {
             Point.Origin = new Point(0, 0);
-        })(Y.Point || (Y.Point = {}));
-        var Point = Y.Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Point = Y.Point || (Y.Point = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [classPoint.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
         // duplicate identifier
         var Point = (function () {
@@ -55,8 +56,7 @@ var X;
             return Point;
         })();
         Y.Point = Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 //// [simple.js]
 var A;

tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.js

@@ -32,10 +32,10 @@ module B {
 //// [module.js]
 var A;
 (function (A) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(A.Point || (A.Point = {}));
-    var Point = A.Point;
+    })(Point = A.Point || (A.Point = {}));
 })(A || (A = {}));
 //// [function.js]
 var A;
@@ -49,10 +49,10 @@ var A;
 //// [simple.js]
 var B;
 (function (B) {
+    var Point;
     (function (Point) {
         Point.Origin = { x: 0, y: 0 };
-    })(B.Point || (B.Point = {}));
-    var Point = B.Point;
+    })(Point = B.Point || (B.Point = {}));
     // duplicate identifier error
     function Point() {
         return { x: 0, y: 0 };

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js

@@ -66,7 +66,9 @@ var p;
 var p;
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
@@ -74,24 +76,22 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
                 }
                 return Line;
             })();
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 // ensure merges as expected
 var l;

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js

@@ -44,13 +44,13 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 //// [part1.js]
 var A;
 (function (A) {
+    var Utils;
     (function (Utils) {
         function mirror(p) {
             return { x: p.y, y: p.x };
         }
         Utils.mirror = mirror;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
     A.Origin = { x: 0, y: 0 };
 })(A || (A = {}));
 //// [part2.js]
@@ -58,6 +58,7 @@ var A;
 (function (A) {
     // not a collision, since we don't export
     var Origin = "0,0";
+    var Utils;
     (function (Utils) {
         var Plane = (function () {
             function Plane(tl, br) {
@@ -67,8 +68,7 @@ var A;
             return Plane;
         })();
         Utils.Plane = Plane;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
 //// [part3.js]
 // test the merging actually worked

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js

@@ -54,7 +54,9 @@ var A;
 })(A || (A = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
@@ -62,14 +64,14 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             // expected error
             var Line = (function () {
@@ -78,8 +80,6 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));

tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js

@@ -37,10 +37,10 @@ var l: X.Y.Z.Line;
 //// [TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var A;
 (function (A) {
@@ -54,7 +54,9 @@ var x;
 var x = A.B.x;
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var Z;
         (function (Z) {
             var Line = (function () {
                 function Line() {
@@ -62,13 +64,12 @@ var X;
                 return Line;
             })();
             Z.Line = Line;
-        })(Y.Z || (Y.Z = {}));
-        var Z = Y.Z;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(Z = Y.Z || (Y.Z = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
         var Z;
         (function (Z) {
@@ -79,8 +80,7 @@ var X;
             })();
             Z.Line = Line;
         })(Z || (Z = {}));
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 // make sure merging works as expected
 var l;

tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js

@@ -33,23 +33,25 @@ module otherRoot {
 //// [part1.js]
 var Root;
 (function (Root) {
+    var A;
     (function (A) {
+        var Utils;
         (function (Utils) {
             function mirror(p) {
                 return { x: p.y, y: p.x };
             }
             Utils.mirror = mirror;
-        })(A.Utils || (A.Utils = {}));
-        var Utils = A.Utils;
-    })(Root.A || (Root.A = {}));
-    var A = Root.A;
+        })(Utils = A.Utils || (A.Utils = {}));
+    })(A = Root.A || (Root.A = {}));
 })(Root || (Root = {}));
 //// [part2.js]
 var otherRoot;
 (function (otherRoot) {
+    var A;
     (function (A) {
         // have to be fully qualified since in different root
         A.Origin = { x: 0, y: 0 };
+        var Utils;
         (function (Utils) {
             var Plane = (function () {
                 function Plane(tl, br) {
@@ -59,8 +61,6 @@ var otherRoot;
                 return Plane;
             })();
             Utils.Plane = Plane;
-        })(A.Utils || (A.Utils = {}));
-        var Utils = A.Utils;
-    })(otherRoot.A || (otherRoot.A = {}));
-    var A = otherRoot.A;
+        })(Utils = A.Utils || (A.Utils = {}));
+    })(A = otherRoot.A || (otherRoot.A = {}));
 })(otherRoot || (otherRoot = {}));

tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js

@@ -42,18 +42,19 @@ var p = new A.Utils.Plane(o, { x: 1, y: 1 });
 //// [part1.js]
 var A;
 (function (A) {
+    var Utils;
     (function (Utils) {
         function mirror(p) {
             return { x: p.y, y: p.x };
         }
         Utils.mirror = mirror;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
 //// [part2.js]
 var A;
 (function (A) {
     A.Origin = { x: 0, y: 0 };
+    var Utils;
     (function (Utils) {
         var Plane = (function () {
             function Plane(tl, br) {
@@ -63,8 +64,7 @@ var A;
             return Plane;
         })();
         Utils.Plane = Plane;
-    })(A.Utils || (A.Utils = {}));
-    var Utils = A.Utils;
+    })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
 //// [part3.js]
 // test the merging actually worked

tests/baselines/reference/aliasBug.js

@@ -29,7 +29,9 @@ var foo;
         return Provide;
     })();
     foo.Provide = Provide;
+    var bar;
     (function (bar) {
+        var baz;
         (function (baz) {
             var boo = (function () {
                 function boo() {
@@ -37,10 +39,8 @@ var foo;
                 return boo;
             })();
             baz.boo = boo;
-        })(bar.baz || (bar.baz = {}));
-        var baz = bar.baz;
-    })(foo.bar || (foo.bar = {}));
-    var bar = foo.bar;
+        })(baz = bar.baz || (bar.baz = {}));
+    })(bar = foo.bar || (foo.bar = {}));
 })(foo || (foo = {}));
 var provide = foo;
 var booz = foo.bar.baz;

tests/baselines/reference/ambientExternalModuleInsideNonAmbient.errors.txt

@@ -0,0 +1,6 @@
+==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbient.ts (1 errors) ====
+    module M {
+        export declare module "M" { }
+                              ~~~
+!!! Ambient external modules cannot be nested in other modules.
+    }

tests/baselines/reference/ambientExternalModuleInsideNonAmbient.js

@@ -0,0 +1,6 @@
+//// [ambientExternalModuleInsideNonAmbient.ts]
+module M {
+    export declare module "M" { }
+}
+
+//// [ambientExternalModuleInsideNonAmbient.js]

tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt

@@ -0,0 +1,4 @@
+==== tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts (1 errors) ====
+    export declare module "M" { }
+                          ~~~
+!!! Ambient external modules cannot be nested in other modules.

tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js

@@ -0,0 +1,6 @@
+//// [ambientExternalModuleInsideNonAmbientExternalModule.ts]
+export declare module "M" { }
+
+//// [ambientExternalModuleInsideNonAmbientExternalModule.js]
+define(["require", "exports"], function (require, exports) {
+});

tests/baselines/reference/ambientExternalModuleMerging.js

@@ -0,0 +1,25 @@
+//// [tests/cases/conformance/ambient/ambientExternalModuleMerging.ts] ////
+
+//// [ambientExternalModuleMerging_use.ts]
+import M = require("M");
+// Should be strings
+var x = M.x;
+var y = M.y;
+
+//// [ambientExternalModuleMerging_declare.ts]
+declare module "M" {
+    export var x: string;
+}
+
+// Merge
+declare module "M" {
+    export var y: string;
+}
+
+//// [ambientExternalModuleMerging_use.js]
+define(["require", "exports", "M"], function (require, exports, M) {
+    // Should be strings
+    var x = M.x;
+    var y = M.y;
+});
+//// [ambientExternalModuleMerging_declare.js]

tests/baselines/reference/ambientExternalModuleMerging.types

@@ -0,0 +1,28 @@
+=== tests/cases/conformance/ambient/ambientExternalModuleMerging_use.ts ===
+import M = require("M");
+>M : typeof M
+
+// Should be strings
+var x = M.x;
+>x : string
+>M.x : string
+>M : typeof M
+>x : string
+
+var y = M.y;
+>y : string
+>M.y : string
+>M : typeof M
+>y : string
+
+=== tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts ===
+declare module "M" {
+    export var x: string;
+>x : string
+}
+
+// Merge
+declare module "M" {
+    export var y: string;
+>y : string
+}

tests/baselines/reference/ambientInsideNonAmbient.js

@@ -0,0 +1,24 @@
+//// [ambientInsideNonAmbient.ts]
+module M {
+    export declare var x;
+    export declare function f();
+    export declare class C { }
+    export declare enum E { }
+    export declare module M { }
+}
+
+module M2 {
+    declare var x;
+    declare function f();
+    declare class C { }
+    declare enum E { }
+    declare module M { }
+}
+
+//// [ambientInsideNonAmbient.js]
+var M;
+(function (M) {
+})(M || (M = {}));
+var M2;
+(function (M2) {
+})(M2 || (M2 = {}));

tests/baselines/reference/ambientInsideNonAmbient.types

@@ -0,0 +1,38 @@
+=== tests/cases/conformance/ambient/ambientInsideNonAmbient.ts ===
+module M {
+>M : typeof M
+
+    export declare var x;
+>x : any
+
+    export declare function f();
+>f : () => any
+
+    export declare class C { }
+>C : C
+
+    export declare enum E { }
+>E : E
+
+    export declare module M { }
+>M : unknown
+}
+
+module M2 {
+>M2 : typeof M2
+
+    declare var x;
+>x : any
+
+    declare function f();
+>f : () => any
+
+    declare class C { }
+>C : C
+
+    declare enum E { }
+>E : E
+
+    declare module M { }
+>M : unknown
+}

tests/baselines/reference/ambientInsideNonAmbientExternalModule.js

@@ -0,0 +1,10 @@
+//// [ambientInsideNonAmbientExternalModule.ts]
+export declare var x;
+export declare function f();
+export declare class C { }
+export declare enum E { }
+export declare module M { }
+
+//// [ambientInsideNonAmbientExternalModule.js]
+define(["require", "exports"], function (require, exports) {
+});

tests/baselines/reference/ambientInsideNonAmbientExternalModule.types

@@ -0,0 +1,16 @@
+=== tests/cases/conformance/ambient/ambientInsideNonAmbientExternalModule.ts ===
+export declare var x;
+>x : any
+
+export declare function f();
+>f : () => any
+
+export declare class C { }
+>C : C
+
+export declare enum E { }
+>E : E
+
+export declare module M { }
+>M : unknown
+

tests/baselines/reference/arrayBestCommonTypes.types

@@ -222,7 +222,7 @@ class f {
 >base : base
 >[ { x: undefined, y: new base() }, { x: '', y: new derived() } ] : { x: string; y: base; }[]
 >{ x: undefined, y: new base() } : { x: undefined; y: base; }
->x : any
+>x : undefined
 >undefined : undefined
 >y : base
 >new base() : base

tests/baselines/reference/arrayCast.errors.txt

@@ -3,8 +3,9 @@
     // has type { foo: string }[], which is not assignable to { id: number }[].
     <{ id: number; }[]>[{ foo: "s" }];
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Neither type '{ id: number; }[]' nor type '{ foo: string; }[]' is assignable to the other:
-!!!   Type '{ id: number; }' is not assignable to type '{ foo: string; }'.
+!!! Neither type '{ foo: string; }[]' nor type '{ id: number; }[]' is assignable to the other:
+!!!   Type '{ foo: string; }' is not assignable to type '{ id: number; }':
+!!!     Property 'id' is missing in type '{ foo: string; }'.
     
     // Should succeed, as the {} element causes the type of the array to be {}[]
     <{ id: number; }[]>[{ foo: "s" }, {}]; 

tests/baselines/reference/assignmentToParenthesizedIdentifiers.js

@@ -91,10 +91,10 @@ M = { y: 3 }; // Error
 (M) = { y: 3 }; // Error
 var M2;
 (function (M2) {
+    var M3;
     (function (M3) {
         M3.x;
-    })(M2.M3 || (M2.M3 = {}));
-    var M3 = M2.M3;
+    })(M3 = M2.M3 || (M2.M3 = {}));
     M3 = { x: 3 }; // Error
 })(M2 || (M2 = {}));
 M2.M3 = { x: 3 }; // OK

tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/compiler/augmentedTypeAssignmentCompatIndexSignature.ts (2 errors) ====
+==== tests/cases/conformance/types/members/augmentedTypeAssignmentCompatIndexSignature.ts (2 errors) ====
     interface Foo { a }
     interface Bar { b }
     

tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.types

@@ -1,4 +1,4 @@
-=== tests/cases/compiler/augmentedTypeBracketAccessIndexSignature.ts ===
+=== tests/cases/conformance/types/members/augmentedTypeBracketAccessIndexSignature.ts ===
 interface Foo { a }
 >Foo : Foo
 >a : any

tests/baselines/reference/chainedImportAlias.js

@@ -12,12 +12,12 @@ y.m.foo();
 
 
 //// [chainedImportAlias_file0.js]
+var m;
 (function (m) {
     function foo() {
     }
     m.foo = foo;
-})(exports.m || (exports.m = {}));
-var m = exports.m;
+})(m = exports.m || (exports.m = {}));
 //// [chainedImportAlias_file1.js]
 var x = require('chainedImportAlias_file0');
 var y = x;

tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js

@@ -26,10 +26,10 @@ var M;
         return N;
     })();
     M.N = N;
+    var N;
     (function (N) {
         N.v = 0;
-    })(M.N || (M.N = {}));
-    var N = M.N;
+    })(N = M.N || (M.N = {}));
 })(M || (M = {}));
 var M;
 (function (M) {

tests/baselines/reference/classDoesNotDependOnPrivateMember.js

@@ -0,0 +1,26 @@
+//// [classDoesNotDependOnPrivateMember.ts]
+module M {
+    interface I { }
+    export class C {
+        private x: I;
+    }
+}
+
+//// [classDoesNotDependOnPrivateMember.js]
+var M;
+(function (M) {
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    })();
+    M.C = C;
+})(M || (M = {}));
+
+
+//// [classDoesNotDependOnPrivateMember.d.ts]
+declare module M {
+    class C {
+        private x;
+    }
+}

tests/baselines/reference/classDoesNotDependOnPrivateMember.types

@@ -0,0 +1,15 @@
+=== tests/cases/conformance/declarationEmit/classDoesNotDependOnPrivateMember.ts ===
+module M {
+>M : typeof M
+
+    interface I { }
+>I : I
+
+    export class C {
+>C : C
+
+        private x: I;
+>x : I
+>I : I
+    }
+}

tests/baselines/reference/cloduleAcrossModuleDefinitions.js

@@ -31,9 +31,9 @@ var A;
 })(A || (A = {}));
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var b; // ok

tests/baselines/reference/cloduleWithRecursiveReference.js

@@ -16,8 +16,8 @@ var M;
         return C;
     })();
     M.C = C;
+    var C;
     (function (_C) {
         _C.C = M.C;
-    })(M.C || (M.C = {}));
-    var C = M.C;
+    })(C = M.C || (M.C = {}));
 })(M || (M = {}));

tests/baselines/reference/clodulesDerivedClasses.js

@@ -36,13 +36,13 @@ var Shape = (function () {
 })();
 var Shape;
 (function (Shape) {
+    var Utils;
     (function (Utils) {
         function convert() {
             return null;
         }
         Utils.convert = convert;
-    })(Shape.Utils || (Shape.Utils = {}));
-    var Utils = Shape.Utils;
+    })(Utils = Shape.Utils || (Shape.Utils = {}));
 })(Shape || (Shape = {}));
 var Path = (function (_super) {
     __extends(Path, _super);
@@ -53,11 +53,11 @@ var Path = (function (_super) {
 })(Shape);
 var Path;
 (function (Path) {
+    var Utils;
     (function (Utils) {
         function convert2() {
             return null;
         }
         Utils.convert2 = convert2;
-    })(Path.Utils || (Path.Utils = {}));
-    var Utils = Path.Utils;
+    })(Utils = Path.Utils || (Path.Utils = {}));
 })(Path || (Path = {}));

tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js

@@ -24,6 +24,7 @@ module m2 {
 
 //// [collisionExportsRequireAndInternalModuleAlias.js]
 define(["require", "exports"], function (require, exports) {
+    var m;
     (function (m) {
         var c = (function () {
             function c() {
@@ -31,8 +32,7 @@ define(["require", "exports"], function (require, exports) {
             return c;
         })();
         m.c = c;
-    })(exports.m || (exports.m = {}));
-    var m = exports.m;
+    })(m = exports.m || (exports.m = {}));
     var exports = m.c;
     var require = m.c;
     new exports();

tests/baselines/reference/collisionExportsRequireAndModule.js

@@ -93,6 +93,7 @@ module m4 {
 
 //// [collisionExportsRequireAndModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
+    var require;
     (function (require) {
         var C = (function () {
             function C() {
@@ -100,12 +101,12 @@ define(["require", "exports"], function (require, exports) {
             return C;
         })();
         require.C = C;
-    })(exports.require || (exports.require = {}));
-    var require = exports.require;
+    })(require = exports.require || (exports.require = {}));
     function foo() {
         return null;
     }
     exports.foo = foo;
+    var exports;
     (function (exports) {
         var C = (function () {
             function C() {
@@ -113,8 +114,7 @@ define(["require", "exports"], function (require, exports) {
             return C;
         })();
         exports.C = C;
-    })(exports.exports || (exports.exports = {}));
-    var exports = exports.exports;
+    })(exports = exports.exports || (exports.exports = {}));
     function foo2() {
         return null;
     }
@@ -142,6 +142,7 @@ define(["require", "exports"], function (require, exports) {
     })(m1 || (m1 = {}));
     var m2;
     (function (m2) {
+        var require;
         (function (require) {
             var C = (function () {
                 function C() {
@@ -149,8 +150,8 @@ define(["require", "exports"], function (require, exports) {
                 return C;
             })();
             require.C = C;
-        })(m2.require || (m2.require = {}));
-        var require = m2.require;
+        })(require = m2.require || (m2.require = {}));
+        var exports;
         (function (exports) {
             var C = (function () {
                 function C() {
@@ -158,8 +159,7 @@ define(["require", "exports"], function (require, exports) {
                 return C;
             })();
             exports.C = C;
-        })(m2.exports || (m2.exports = {}));
-        var exports = m2.exports;
+        })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
 });
 //// [collisionExportsRequireAndModule_globalFile.js]
@@ -204,6 +204,7 @@ var m3;
 })(m3 || (m3 = {}));
 var m4;
 (function (m4) {
+    var require;
     (function (require) {
         var C = (function () {
             function C() {
@@ -211,8 +212,8 @@ var m4;
             return C;
         })();
         require.C = C;
-    })(m4.require || (m4.require = {}));
-    var require = m4.require;
+    })(require = m4.require || (m4.require = {}));
+    var exports;
     (function (exports) {
         var C = (function () {
             function C() {
@@ -220,6 +221,5 @@ var m4;
             return C;
         })();
         exports.C = C;
-    })(m4.exports || (m4.exports = {}));
-    var exports = m4.exports;
+    })(exports = m4.exports || (m4.exports = {}));
 })(m4 || (m4 = {}));

tests/baselines/reference/commentsClassMembers.js

@@ -557,11 +557,11 @@ declare var i1_ncf: (b: number) => number;
 declare var i1_ncr: number;
 declare var i1_ncprop: number;
 declare var i1_s_p: number;
-declare var i1_s_f: typeof s2;
+declare var i1_s_f: typeof c1.s2;
 declare var i1_s_r: number;
 declare var i1_s_prop: number;
 declare var i1_s_nc_p: number;
-declare var i1_s_ncf: typeof nc_s2;
+declare var i1_s_ncf: typeof c1.nc_s2;
 declare var i1_s_ncr: number;
 declare var i1_s_ncprop: number;
 declare var i1_c: typeof c1;
@@ -577,111 +577,3 @@ declare class cProperties {
     private y;
 }
 declare var cProperties_i: cProperties;
-
-
-//// [DtsFileErrors]
-
-
-==== tests/cases/compiler/commentsClassMembers.d.ts (2 errors) ====
-    /** This is comment for c1*/
-    declare class c1 {
-        /** p1 is property of c1*/
-        p1: number;
-        /** sum with property*/
-        p2(/** number to add*/ b: number): number;
-        /** getter property*/
-        /** setter property*/
-        p3: number;
-        /** pp1 is property of c1*/
-        private pp1;
-        /** sum with property*/
-        private pp2(/** number to add*/ b);
-        /** getter property*/
-        /** setter property*/
-        private pp3;
-        /** Constructor method*/
-        constructor();
-        /** s1 is static property of c1*/
-        static s1: number;
-        /** static sum with property*/
-        static s2(/** number to add*/ b: number): number;
-        /** static getter property*/
-        /** setter property*/
-        static s3: number;
-        nc_p1: number;
-        nc_p2(b: number): number;
-        nc_p3: number;
-        private nc_pp1;
-        private nc_pp2(b);
-        private nc_pp3;
-        static nc_s1: number;
-        static nc_s2(b: number): number;
-        static nc_s3: number;
-        a_p1: number;
-        a_p2(b: number): number;
-        a_p3: number;
-        private a_pp1;
-        private a_pp2(b);
-        private a_pp3;
-        static a_s1: number;
-        static a_s2(b: number): number;
-        static a_s3: number;
-        /** p1 is property of c1 */
-        b_p1: number;
-        /** sum with property */
-        b_p2(b: number): number;
-        /** getter property */
-        /** setter property */
-        b_p3: number;
-        /** pp1 is property of c1 */
-        private b_pp1;
-        /** sum with property */
-        private b_pp2(b);
-        /** getter property */
-        /** setter property */
-        private b_pp3;
-        /** s1 is static property of c1 */
-        static b_s1: number;
-        /** static sum with property */
-        static b_s2(b: number): number;
-        /** static getter property
-        */
-        /** setter property
-        */
-        static b_s3: number;
-    }
-    declare var i1: c1;
-    declare var i1_p: number;
-    declare var i1_f: (b: number) => number;
-    declare var i1_r: number;
-    declare var i1_prop: number;
-    declare var i1_nc_p: number;
-    declare var i1_ncf: (b: number) => number;
-    declare var i1_ncr: number;
-    declare var i1_ncprop: number;
-    declare var i1_s_p: number;
-    declare var i1_s_f: typeof s2;
-                               ~~
-!!! Cannot find name 's2'.
-    declare var i1_s_r: number;
-    declare var i1_s_prop: number;
-    declare var i1_s_nc_p: number;
-    declare var i1_s_ncf: typeof nc_s2;
-                                 ~~~~~
-!!! Cannot find name 'nc_s2'.
-    declare var i1_s_ncr: number;
-    declare var i1_s_ncprop: number;
-    declare var i1_c: typeof c1;
-    declare class cProperties {
-        private val;
-        /** getter only property*/
-        p1: number;
-        nc_p1: number;
-        /**setter only property*/
-        p2: number;
-        nc_p2: number;
-        x: number;
-        private y;
-    }
-    declare var cProperties_i: cProperties;
-    

tests/baselines/reference/commentsDottedModuleName.js

@@ -10,7 +10,9 @@ export module outerModule.InnerModule {
 //// [commentsDottedModuleName.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi declare module*/
+    var outerModule;
     (function (outerModule) {
+        var InnerModule;
         (function (InnerModule) {
             /// class b comment
             var b = (function () {
@@ -19,10 +21,8 @@ define(["require", "exports"], function (require, exports) {
                 return b;
             })();
             InnerModule.b = b;
-        })(outerModule.InnerModule || (outerModule.InnerModule = {}));
-        var InnerModule = outerModule.InnerModule;
-    })(exports.outerModule || (exports.outerModule = {}));
-    var outerModule = exports.outerModule;
+        })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {}));
+    })(outerModule = exports.outerModule || (exports.outerModule = {}));
 });
 
 

tests/baselines/reference/commentsExternalModules.js

@@ -64,6 +64,7 @@ var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules_0.js]
 define(["require", "exports"], function (require, exports) {
     /** Module comment*/
+    var m1;
     (function (m1) {
         /** b's comment*/
         m1.b;
@@ -72,6 +73,7 @@ define(["require", "exports"], function (require, exports) {
             return m1.b;
         }
         /** m2 comments*/
+        var m2;
         (function (m2) {
             /** class comment;*/
             var c = (function () {
@@ -83,18 +85,17 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i*/
             m2.i = new c();
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
         /** exported function*/
         function fooExport() {
             return foo();
         }
         m1.fooExport = fooExport;
-    })(exports.m1 || (exports.m1 = {}));
-    var m1 = exports.m1;
+    })(m1 = exports.m1 || (exports.m1 = {}));
     m1.fooExport();
     var myvar = new m1.m2.c();
     /** Module comment */
+    var m4;
     (function (m4) {
         /** b's comment */
         m4.b;
@@ -105,6 +106,7 @@ define(["require", "exports"], function (require, exports) {
         }
         /** m2 comments
         */
+        var m2;
         (function (m2) {
             /** class comment; */
             var c = (function () {
@@ -116,15 +118,13 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i */
             m2.i = new c();
-        })(m4.m2 || (m4.m2 = {}));
-        var m2 = m4.m2;
+        })(m2 = m4.m2 || (m4.m2 = {}));
         /** exported function */
         function fooExport() {
             return foo();
         }
         m4.fooExport = fooExport;
-    })(exports.m4 || (exports.m4 = {}));
-    var m4 = exports.m4;
+    })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
 });

tests/baselines/reference/commentsExternalModules2.js

@@ -64,6 +64,7 @@ export var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules2_0.js]
 define(["require", "exports"], function (require, exports) {
     /** Module comment*/
+    var m1;
     (function (m1) {
         /** b's comment*/
         m1.b;
@@ -72,6 +73,7 @@ define(["require", "exports"], function (require, exports) {
             return m1.b;
         }
         /** m2 comments*/
+        var m2;
         (function (m2) {
             /** class comment;*/
             var c = (function () {
@@ -83,18 +85,17 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i*/
             m2.i = new c();
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
         /** exported function*/
         function fooExport() {
             return foo();
         }
         m1.fooExport = fooExport;
-    })(exports.m1 || (exports.m1 = {}));
-    var m1 = exports.m1;
+    })(m1 = exports.m1 || (exports.m1 = {}));
     m1.fooExport();
     var myvar = new m1.m2.c();
     /** Module comment */
+    var m4;
     (function (m4) {
         /** b's comment */
         m4.b;
@@ -105,6 +106,7 @@ define(["require", "exports"], function (require, exports) {
         }
         /** m2 comments
         */
+        var m2;
         (function (m2) {
             /** class comment; */
             var c = (function () {
@@ -116,15 +118,13 @@ define(["require", "exports"], function (require, exports) {
             ;
             /** i */
             m2.i = new c();
-        })(m4.m2 || (m4.m2 = {}));
-        var m2 = m4.m2;
+        })(m2 = m4.m2 || (m4.m2 = {}));
         /** exported function */
         function fooExport() {
             return foo();
         }
         m4.fooExport = fooExport;
-    })(exports.m4 || (exports.m4 = {}));
-    var m4 = exports.m4;
+    })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
 });

tests/baselines/reference/commentsExternalModules3.js

@@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c();
 
 //// [commentsExternalModules2_0.js]
 /** Module comment*/
+var m1;
 (function (m1) {
     /** b's comment*/
     m1.b;
@@ -71,6 +72,7 @@ export var newVar2 = new extMod.m4.m2.c();
         return m1.b;
     }
     /** m2 comments*/
+    var m2;
     (function (m2) {
         /** class comment;*/
         var c = (function () {
@@ -82,18 +84,17 @@ export var newVar2 = new extMod.m4.m2.c();
         ;
         /** i*/
         m2.i = new c();
-    })(m1.m2 || (m1.m2 = {}));
-    var m2 = m1.m2;
+    })(m2 = m1.m2 || (m1.m2 = {}));
     /** exported function*/
     function fooExport() {
         return foo();
     }
     m1.fooExport = fooExport;
-})(exports.m1 || (exports.m1 = {}));
-var m1 = exports.m1;
+})(m1 = exports.m1 || (exports.m1 = {}));
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** Module comment */
+var m4;
 (function (m4) {
     /** b's comment */
     m4.b;
@@ -104,6 +105,7 @@ var myvar = new m1.m2.c();
     }
     /** m2 comments
     */
+    var m2;
     (function (m2) {
         /** class comment; */
         var c = (function () {
@@ -115,15 +117,13 @@ var myvar = new m1.m2.c();
         ;
         /** i */
         m2.i = new c();
-    })(m4.m2 || (m4.m2 = {}));
-    var m2 = m4.m2;
+    })(m2 = m4.m2 || (m4.m2 = {}));
     /** exported function */
     function fooExport() {
         return foo();
     }
     m4.fooExport = fooExport;
-})(exports.m4 || (exports.m4 = {}));
-var m4 = exports.m4;
+})(m4 = exports.m4 || (exports.m4 = {}));
 m4.fooExport();
 var myvar2 = new m4.m2.c();
 //// [commentsExternalModules_1.js]

tests/baselines/reference/commentsModules.js

@@ -108,6 +108,7 @@ var m1;
         return m1.b;
     }
     /** m2 comments*/
+    var m2;
     (function (m2) {
         /** class comment;*/
         var c = (function () {
@@ -119,8 +120,7 @@ var m1;
         ;
         /** i*/
         m2.i = new c();
-    })(m1.m2 || (m1.m2 = {}));
-    var m2 = m1.m2;
+    })(m2 = m1.m2 || (m1.m2 = {}));
     /** exported function*/
     function fooExport() {
         return foo();
@@ -147,6 +147,7 @@ var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
 var m2;
 (function (m2) {
+    var m3;
     (function (m3) {
         /** Exported class comment*/
         var c = (function () {
@@ -155,14 +156,15 @@ var m2;
             return c;
         })();
         m3.c = c;
-    })(m2.m3 || (m2.m3 = {}));
-    var m3 = m2.m3;
+    })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 || (m2 = {})); /* trailing dotted module comment*/
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 var m3;
 (function (m3) {
+    var m4;
     (function (m4) {
+        var m5;
         (function (m5) {
             /** Exported class comment*/
             var c = (function () {
@@ -171,17 +173,18 @@ var m3;
                 return c;
             })();
             m5.c = c;
-        })(m4.m5 || (m4.m5 = {}));
-        var m5 = m4.m5;
-    })(m3.m4 || (m3.m4 = {}));
-    var m4 = m3.m4;
+        })(m5 = m4.m5 || (m4.m5 = {}));
+    })(m4 = m3.m4 || (m3.m4 = {}));
 })(m3 || (m3 = {})); // trailing dotted module 2
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 var m4;
 (function (m4) {
+    var m5;
     (function (m5) {
+        var m6;
         (function (m6) {
+            var m7;
             (function (m7) {
                 /** Exported class comment*/
                 var c = (function () {
@@ -190,20 +193,20 @@ var m4;
                     return c;
                 })();
                 m7.c = c;
-            })(m6.m7 || (m6.m7 = {}));
-            var m7 = m6.m7; /* trailing inner module */ /* multiple comments*/
-        })(m5.m6 || (m5.m6 = {}));
-        var m6 = m5.m6;
-    })(m4.m5 || (m4.m5 = {}));
-    var m5 = m4.m5;
+            })(m7 = m6.m7 || (m6.m7 = {})); /* trailing inner module */ /* multiple comments*/
+        })(m6 = m5.m6 || (m5.m6 = {}));
+    })(m5 = m4.m5 || (m4.m5 = {}));
 })(m4 || (m4 = {}));
 new m4.m5.m6.m7.c();
 /** module comment of m5.m6.m7*/
 var m5;
 (function (m5) {
+    var m6;
     (function (m6) {
+        var m7;
         (function (m7) {
             /** module m8 comment*/
+            var m8;
             (function (m8) {
                 /** Exported class comment*/
                 var c = (function () {
@@ -212,17 +215,16 @@ var m5;
                     return c;
                 })();
                 m8.c = c;
-            })(m7.m8 || (m7.m8 = {}));
-            var m8 = m7.m8;
-        })(m6.m7 || (m6.m7 = {}));
-        var m7 = m6.m7;
-    })(m5.m6 || (m5.m6 = {}));
-    var m6 = m5.m6;
+            })(m8 = m7.m8 || (m7.m8 = {}));
+        })(m7 = m6.m7 || (m6.m7 = {}));
+    })(m6 = m5.m6 || (m5.m6 = {}));
 })(m5 || (m5 = {}));
 new m5.m6.m7.m8.c();
 var m6;
 (function (m6) {
+    var m7;
     (function (m7) {
+        var m8;
         (function (m8) {
             /** Exported class comment*/
             var c = (function () {
@@ -231,16 +233,16 @@ var m6;
                 return c;
             })();
             m8.c = c;
-        })(m7.m8 || (m7.m8 = {}));
-        var m8 = m7.m8;
-    })(m6.m7 || (m6.m7 = {}));
-    var m7 = m6.m7;
+        })(m8 = m7.m8 || (m7.m8 = {}));
+    })(m7 = m6.m7 || (m6.m7 = {}));
 })(m6 || (m6 = {}));
 new m6.m7.m8.c();
 var m7;
 (function (m7) {
+    var m8;
     (function (m8) {
         /** module m9 comment*/
+        var m9;
         (function (m9) {
             /** Exported class comment*/
             var c = (function () {
@@ -262,10 +264,8 @@ var m7;
                 return e;
             })();
             m9.e = e;
-        })(m8.m9 || (m8.m9 = {}));
-        var m9 = m8.m9;
-    })(m7.m8 || (m7.m8 = {}));
-    var m8 = m7.m8;
+        })(m9 = m8.m9 || (m8.m9 = {}));
+    })(m8 = m7.m8 || (m7.m8 = {}));
 })(m7 || (m7 = {}));
 new m7.m8.m9.c();
 

tests/baselines/reference/commentsMultiModuleMultiFile.js

@@ -39,6 +39,7 @@ new multiM.d();
 //// [commentsMultiModuleMultiFile_0.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi declare module*/
+    var multiM;
     (function (multiM) {
         /// class b comment
         var b = (function () {
@@ -47,9 +48,9 @@ define(["require", "exports"], function (require, exports) {
             return b;
         })();
         multiM.b = b;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM = exports.multiM || (exports.multiM = {}));
     /** thi is multi module 2*/
+    var multiM;
     (function (multiM) {
         /** class c comment*/
         var c = (function () {
@@ -65,14 +66,14 @@ define(["require", "exports"], function (require, exports) {
             return e;
         })();
         multiM.e = e;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.b();
     new multiM.c();
 });
 //// [commentsMultiModuleMultiFile_1.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi module 3 comment*/
+    var multiM;
     (function (multiM) {
         /** class d comment*/
         var d = (function () {
@@ -88,8 +89,7 @@ define(["require", "exports"], function (require, exports) {
             return f;
         })();
         multiM.f = f;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.d();
 });
 

tests/baselines/reference/contextualTyping39.errors.txt

@@ -1,4 +1,5 @@
 ==== tests/cases/compiler/contextualTyping39.ts (1 errors) ====
     var foo = <{ (): number; }> function() { return "err"; };
               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Neither type '() => number' nor type '() => string' is assignable to the other.
+!!! Neither type '() => string' nor type '() => number' is assignable to the other:
+!!!   Type 'string' is not assignable to type 'number'.

tests/baselines/reference/contextualTyping41.errors.txt

@@ -1,4 +1,5 @@
 ==== tests/cases/compiler/contextualTyping41.ts (1 errors) ====
     var foo = <{():number; (i:number):number; }> (function(){return "err";});
               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Neither type '{ (): number; (i: number): number; }' nor type '() => string' is assignable to the other.
+!!! Neither type '() => string' nor type '{ (): number; (i: number): number; }' is assignable to the other:
+!!!   Type 'string' is not assignable to type 'number'.

tests/baselines/reference/contextuallyTypedFunctionExpressionsAndReturnAnnotations.js

@@ -0,0 +1,28 @@
+//// [contextuallyTypedFunctionExpressionsAndReturnAnnotations.ts]
+declare function foo(x: (y: string) => (y2: number) => void);
+
+// Contextually type the parameter even if there is a return annotation
+foo((y): (y2: number) => void => {
+    var z = y.charAt(0); // Should be string
+    return null;
+});
+
+foo((y: string) => {
+    return y2 => {
+        var z = y2.toFixed(); // Should be string
+        return 0;
+    };
+});
+
+//// [contextuallyTypedFunctionExpressionsAndReturnAnnotations.js]
+// Contextually type the parameter even if there is a return annotation
+foo(function (y) {
+    var z = y.charAt(0); // Should be string
+    return null;
+});
+foo(function (y) {
+    return function (y2) {
+        var z = y2.toFixed(); // Should be string
+        return 0;
+    };
+});

tests/baselines/reference/contextuallyTypedFunctionExpressionsAndReturnAnnotations.types

@@ -0,0 +1,45 @@
+=== tests/cases/conformance/expressions/functions/contextuallyTypedFunctionExpressionsAndReturnAnnotations.ts ===
+declare function foo(x: (y: string) => (y2: number) => void);
+>foo : (x: (y: string) => (y2: number) => void) => any
+>x : (y: string) => (y2: number) => void
+>y : string
+>y2 : number
+
+// Contextually type the parameter even if there is a return annotation
+foo((y): (y2: number) => void => {
+>foo((y): (y2: number) => void => {    var z = y.charAt(0); // Should be string    return null;}) : any
+>foo : (x: (y: string) => (y2: number) => void) => any
+>(y): (y2: number) => void => {    var z = y.charAt(0); // Should be string    return null;} : (y: string) => (y2: number) => void
+>y : string
+>y2 : number
+
+    var z = y.charAt(0); // Should be string
+>z : string
+>y.charAt(0) : string
+>y.charAt : (pos: number) => string
+>y : string
+>charAt : (pos: number) => string
+
+    return null;
+});
+
+foo((y: string) => {
+>foo((y: string) => {    return y2 => {        var z = y2.toFixed(); // Should be string        return 0;    };}) : any
+>foo : (x: (y: string) => (y2: number) => void) => any
+>(y: string) => {    return y2 => {        var z = y2.toFixed(); // Should be string        return 0;    };} : (y: string) => (y2: number) => number
+>y : string
+
+    return y2 => {
+>y2 => {        var z = y2.toFixed(); // Should be string        return 0;    } : (y2: number) => number
+>y2 : number
+
+        var z = y2.toFixed(); // Should be string
+>z : string
+>y2.toFixed() : string
+>y2.toFixed : (fractionDigits?: number) => string
+>y2 : number
+>toFixed : (fractionDigits?: number) => string
+
+        return 0;
+    };
+});

tests/baselines/reference/crashRegressionTest.js

@@ -28,7 +28,9 @@ module MsPortal.Util.TemplateEngine {
 //// [crashRegressionTest.js]
 var MsPortal;
 (function (MsPortal) {
+    var Util;
     (function (Util) {
+        var TemplateEngine;
         (function (TemplateEngine) {
             "use strict";
             var StringTemplate = (function () {
@@ -48,8 +50,6 @@ var MsPortal;
                 return TemplateStorage;
             })();
             TemplateEngine.TemplateStorage = TemplateStorage;
-        })(Util.TemplateEngine || (Util.TemplateEngine = {}));
-        var TemplateEngine = Util.TemplateEngine;
-    })(MsPortal.Util || (MsPortal.Util = {}));
-    var Util = MsPortal.Util;
+        })(TemplateEngine = Util.TemplateEngine || (Util.TemplateEngine = {}));
+    })(Util = MsPortal.Util || (MsPortal.Util = {}));
 })(MsPortal || (MsPortal = {}));

tests/baselines/reference/declFileExportImportChain.js

@@ -28,6 +28,7 @@ export var x: c.b1.a.m2.c1;
 define(["require", "exports"], function (require, exports) {
     var m1;
     (function (m1) {
+        var m2;
         (function (m2) {
             var c1 = (function () {
                 function c1() {
@@ -35,8 +36,7 @@ define(["require", "exports"], function (require, exports) {
                 return c1;
             })();
             m2.c1 = c1;
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
     })(m1 || (m1 = {}));
     return m1;
 });

tests/baselines/reference/declFileExportImportChain2.js

@@ -25,6 +25,7 @@ export var x: c.b.m2.c1;
 define(["require", "exports"], function (require, exports) {
     var m1;
     (function (m1) {
+        var m2;
         (function (m2) {
             var c1 = (function () {
                 function c1() {
@@ -32,8 +33,7 @@ define(["require", "exports"], function (require, exports) {
                 return c1;
             })();
             m2.c1 = c1;
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
+        })(m2 = m1.m2 || (m1.m2 = {}));
     })(m1 || (m1 = {}));
     return m1;
 });

tests/baselines/reference/declFileGenericType.js

@@ -46,6 +46,7 @@ var __extends = this.__extends || function (d, b) {
     __.prototype = b.prototype;
     d.prototype = new __();
 };
+var C;
 (function (C) {
     var A = (function () {
         function A() {
@@ -90,8 +91,7 @@ var __extends = this.__extends || function (d, b) {
         return D;
     })();
     C.D = D;
-})(exports.C || (exports.C = {}));
-var C = exports.C;
+})(C = exports.C || (exports.C = {}));
 exports.a;
 exports.b = C.F;
 exports.c = C.F2;

tests/baselines/reference/declFileGenericType2.js

@@ -52,7 +52,9 @@ var __extends = this.__extends || function (d, b) {
 // Module
 var templa;
 (function (templa) {
+    var dom;
     (function (dom) {
+        var mvc;
         (function (mvc) {
             var AbstractElementController = (function (_super) {
                 __extends(AbstractElementController, _super);
@@ -62,16 +64,17 @@ var templa;
                 return AbstractElementController;
             })(templa.mvc.AbstractController);
             mvc.AbstractElementController = AbstractElementController;
-        })(dom.mvc || (dom.mvc = {}));
-        var mvc = dom.mvc;
-    })(templa.dom || (templa.dom = {}));
-    var dom = templa.dom;
+        })(mvc = dom.mvc || (dom.mvc = {}));
+    })(dom = templa.dom || (templa.dom = {}));
 })(templa || (templa = {}));
 // Module
 var templa;
 (function (templa) {
+    var dom;
     (function (dom) {
+        var mvc;
         (function (mvc) {
+            var composite;
             (function (composite) {
                 var AbstractCompositeElementController = (function (_super) {
                     __extends(AbstractCompositeElementController, _super);
@@ -82,12 +85,9 @@ var templa;
                     return AbstractCompositeElementController;
                 })(templa.dom.mvc.AbstractElementController);
                 composite.AbstractCompositeElementController = AbstractCompositeElementController;
-            })(mvc.composite || (mvc.composite = {}));
-            var composite = mvc.composite;
-        })(dom.mvc || (dom.mvc = {}));
-        var mvc = dom.mvc;
-    })(templa.dom || (templa.dom = {}));
-    var dom = templa.dom;
+            })(composite = mvc.composite || (mvc.composite = {}));
+        })(mvc = dom.mvc || (dom.mvc = {}));
+    })(dom = templa.dom || (templa.dom = {}));
 })(templa || (templa = {}));
 
 

tests/baselines/reference/declFileImportChainInExportAssignment.js

@@ -12,6 +12,7 @@ export = b;
 //// [declFileImportChainInExportAssignment.js]
 var m;
 (function (m) {
+    var c;
     (function (_c) {
         var c = (function () {
             function c() {
@@ -19,8 +20,7 @@ var m;
             return c;
         })();
         _c.c = c;
-    })(m.c || (m.c = {}));
-    var c = m.c;
+    })(c = m.c || (m.c = {}));
 })(m || (m = {}));
 var a = m.c;
 var b = a;

tests/baselines/reference/declFileModuleContinuation.js

@@ -12,7 +12,9 @@ module A.B.C {
 //// [declFileModuleContinuation.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
+        var C;
         (function (C) {
             var W = (function () {
                 function W() {
@@ -20,10 +22,8 @@ var A;
                 return W;
             })();
             C.W = W;
-        })(B.C || (B.C = {}));
-        var C = B.C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+        })(C = B.C || (B.C = {}));
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 
 

tests/baselines/reference/declFileRegressionTests.types

@@ -4,7 +4,7 @@
 var n = { w: null, x: '', y: () => { }, z: 32 };
 >n : { w: any; x: string; y: () => void; z: number; }
 >{ w: null, x: '', y: () => { }, z: 32 } : { w: null; x: string; y: () => void; z: number; }
->w : any
+>w : null
 >x : string
 >y : () => void
 >() => { } : () => void

tests/baselines/reference/declFileTypeofFunction.js

@@ -73,6 +73,6 @@ declare function b1(): typeof b1;
 declare function foo(): typeof foo;
 declare var foo1: typeof foo;
 declare var foo2: typeof foo;
-declare var foo3: any;
-declare var x: any;
+declare var foo3: () => any;
+declare var x: () => any;
 declare function foo5(x: number): (x: number) => number;

tests/baselines/reference/declFileTypeofFunction.types

@@ -54,18 +54,18 @@ var foo2 = foo;
 >foo : () => typeof foo
 
 var foo3 = function () {
->foo3 : any
+>foo3 : () => any
 >function () {    return foo3;} : () => any
 
     return foo3;
->foo3 : any
+>foo3 : () => any
 }
 var x = () => {
->x : any
+>x : () => any
 >() => {    return x;} : () => any
 
     return x;
->x : any
+>x : () => any
 }
 
 function foo5(x: number) {

tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js

@@ -29,7 +29,9 @@ var __extends = this.__extends || function (d, b) {
 };
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
             var W = (function (_super) {
                 __extends(W, _super);
@@ -39,15 +41,16 @@ var X;
                 return W;
             })(A.B.Base.W);
             base.W = W;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
+            var Z;
             (function (Z) {
                 var W = (function (_super) {
                     __extends(W, _super);
@@ -57,12 +60,9 @@ var X;
                     return W;
                 })(X.Y.base.W);
                 Z.W = W;
-            })(base.Z || (base.Z = {}));
-            var Z = base.Z;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+            })(Z = base.Z || (base.Z = {}));
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js

@@ -27,6 +27,7 @@ var __extends = this.__extends || function (d, b) {
 };
 var A;
 (function (A) {
+    var B;
     (function (B) {
         var EventManager = (function () {
             function EventManager() {
@@ -34,12 +35,13 @@ var A;
             return EventManager;
         })();
         B.EventManager = EventManager;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var A;
 (function (A) {
+    var B;
     (function (B) {
+        var C;
         (function (C) {
             var ContextMenu = (function (_super) {
                 __extends(ContextMenu, _super);
@@ -49,10 +51,8 @@ var A;
                 return ContextMenu;
             })(B.EventManager);
             C.ContextMenu = ContextMenu;
-        })(B.C || (B.C = {}));
-        var C = B.C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+        })(C = B.C || (B.C = {}));
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 
 

tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js

@@ -14,8 +14,11 @@ module X.A.B.C {
 //// [declFileWithInternalModuleNameConflictsInExtendsClause1.js]
 var X;
 (function (X) {
+    var A;
     (function (A) {
+        var B;
         (function (B) {
+            var C;
             (function (C) {
                 var W = (function () {
                     function W() {
@@ -23,12 +26,9 @@ var X;
                     return W;
                 })();
                 C.W = W;
-            })(B.C || (B.C = {}));
-            var C = B.C;
-        })(A.B || (A.B = {}));
-        var B = A.B;
-    })(X.A || (X.A = {}));
-    var A = X.A;
+            })(C = B.C || (B.C = {}));
+        })(B = A.B || (A.B = {}));
+    })(A = X.A || (X.A = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js

@@ -17,8 +17,11 @@ module X.A.B.C {
 //// [declFileWithInternalModuleNameConflictsInExtendsClause2.js]
 var X;
 (function (X) {
+    var A;
     (function (A) {
+        var B;
         (function (B) {
+            var C;
             (function (C) {
                 var W = (function () {
                     function W() {
@@ -26,12 +29,9 @@ var X;
                     return W;
                 })();
                 C.W = W;
-            })(B.C || (B.C = {}));
-            var C = B.C;
-        })(A.B || (A.B = {}));
-        var B = A.B;
-    })(X.A || (X.A = {}));
-    var A = X.A;
+            })(C = B.C || (B.C = {}));
+        })(B = A.B || (A.B = {}));
+    })(A = X.A || (X.A = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js

@@ -17,8 +17,11 @@ module X.A.B.C {
 //// [declFileWithInternalModuleNameConflictsInExtendsClause3.js]
 var X;
 (function (X) {
+    var A;
     (function (A) {
+        var B;
         (function (B) {
+            var C;
             (function (C) {
                 var W = (function () {
                     function W() {
@@ -26,12 +29,9 @@ var X;
                     return W;
                 })();
                 C.W = W;
-            })(B.C || (B.C = {}));
-            var C = B.C;
-        })(A.B || (A.B = {}));
-        var B = A.B;
-    })(X.A || (X.A = {}));
-    var A = X.A;
+            })(C = B.C || (B.C = {}));
+        })(B = A.B || (A.B = {}));
+    })(A = X.A || (X.A = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declInput3.types

@@ -16,9 +16,9 @@ class bar {
 >a : bar
 ><bar>null : bar
 >bar : bar
->b : any
+>b : undefined
 >undefined : undefined
->c : any
+>c : undefined
 >void 4 : undefined
 
   public h(x = 4, y = null, z = '') { x++; }

tests/baselines/reference/declarationEmit_invalidReference.js

@@ -0,0 +1,11 @@
+//// [declarationEmit_invalidReference.ts]
+/// <reference path="invalid.ts" />
+var x = 0;
+
+//// [declarationEmit_invalidReference.js]
+/// <reference path="invalid.ts" />
+var x = 0;
+
+
+//// [declarationEmit_invalidReference.d.ts]
+declare var x: number;

tests/baselines/reference/declarationEmit_invalidReference.types

@@ -0,0 +1,5 @@
+=== tests/cases/compiler/declarationEmit_invalidReference.ts ===
+/// <reference path="invalid.ts" />
+var x = 0;
+>x : number
+

tests/baselines/reference/declarationEmit_invalidReference2.errors.txt

@@ -0,0 +1,5 @@
+==== tests/cases/compiler/declarationEmit_invalidReference2.ts (1 errors) ====
+    /// <reference path="invalid.ts" />
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! File 'invalid.ts' not found.
+    var x = 0;

tests/baselines/reference/declarationEmit_nameConflicts.js

@@ -62,6 +62,7 @@ var f;
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
 var im = require('declarationEmit_nameConflicts_1');
+var M;
 (function (M) {
     function f() {
     }
@@ -72,20 +73,21 @@ var im = require('declarationEmit_nameConflicts_1');
         return C;
     })();
     M.C = C;
+    var N;
     (function (N) {
         function g() {
         }
         N.g = g;
         ;
-    })(M.N || (M.N = {}));
-    var N = M.N;
+    })(N = M.N || (M.N = {}));
     M.a = M.f;
     M.b = M.C;
     M.c = N;
     M.d = im;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+})(M = exports.M || (exports.M = {}));
+var M;
 (function (M) {
+    var P;
     (function (P) {
         function f() {
         }
@@ -96,24 +98,24 @@ var M = exports.M;
             return C;
         })();
         P.C = C;
+        var N;
         (function (N) {
             function g() {
             }
             N.g = g;
             ;
-        })(P.N || (P.N = {}));
-        var N = P.N;
+        })(N = P.N || (P.N = {}));
         P.im = M.P.f;
         P.a = M.a; // emitted incorrectly as typeof f
         P.b = M.b; // ok
         P.c = M.c; // ok
         P.g = M.c.g; // ok
         P.d = M.d; // emitted incorrectly as typeof im
-    })(M.P || (M.P = {}));
-    var P = M.P;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+    })(P = M.P || (M.P = {}));
+})(M = exports.M || (exports.M = {}));
+var M;
 (function (M) {
+    var Q;
     (function (Q) {
         function f() {
         }
@@ -124,17 +126,15 @@ var M = exports.M;
             return C;
         })();
         Q.C = C;
+        var N;
         (function (N) {
             function g() {
             }
             N.g = g;
             ;
-        })(Q.N || (Q.N = {}));
-        var N = Q.N;
-    })(M.Q || (M.Q = {}));
-    var Q = M.Q;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+        })(N = Q.N || (Q.N = {}));
+    })(Q = M.Q || (M.Q = {}));
+})(M = exports.M || (exports.M = {}));
 
 
 //// [declarationEmit_nameConflicts_1.d.ts]

tests/baselines/reference/declarationEmit_nameConflicts2.js

@@ -18,7 +18,9 @@ module X.Y.base.Z {
 //// [declarationEmit_nameConflicts2.js]
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
             function f() {
             }
@@ -29,33 +31,31 @@ var X;
                 return C;
             })();
             base.C = C;
+            var M;
             (function (M) {
                 M.v;
-            })(base.M || (base.M = {}));
-            var M = base.M;
+            })(M = base.M || (base.M = {}));
             (function (E) {
             })(base.E || (base.E = {}));
             var E = base.E;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var X;
 (function (X) {
+    var Y;
     (function (Y) {
+        var base;
         (function (base) {
+            var Z;
             (function (Z) {
                 Z.f = X.Y.base.f; // Should be base.f
                 Z.C = X.Y.base.C; // Should be base.C
                 Z.M = X.Y.base.M; // Should be base.M
                 Z.E = X.Y.base.E; // Should be base.E
-            })(base.Z || (base.Z = {}));
-            var Z = base.Z;
-        })(Y.base || (Y.base = {}));
-        var base = Y.base;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+            })(Z = base.Z || (base.Z = {}));
+        })(base = Y.base || (Y.base = {}));
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 
 

tests/baselines/reference/declarationEmit_nameConflicts3.js

@@ -35,27 +35,28 @@ var __extends = this.__extends || function (d, b) {
 };
 var M;
 (function (M) {
+    var D;
     (function (D) {
         function f() {
         }
         D.f = f;
-    })(M.D || (M.D = {}));
-    var D = M.D;
+    })(D = M.D || (M.D = {}));
+    var C;
     (function (C) {
         function f() {
         }
         C.f = f;
-    })(M.C || (M.C = {}));
-    var C = M.C;
+    })(C = M.C || (M.C = {}));
+    var E;
     (function (E) {
         function f() {
         }
         E.f = f;
-    })(M.E || (M.E = {}));
-    var E = M.E;
+    })(E = M.E || (M.E = {}));
 })(M || (M = {}));
 var M;
 (function (M) {
+    var P;
     (function (P) {
         var C = (function () {
             function C() {
@@ -81,8 +82,7 @@ var M;
         P.w = M.D.f; // error, should be typeof M.D.f
         P.x = M.C.f; // error, should be typeof M.C.f
         P.x = M.E.f; // error, should be typeof M.E.f
-    })(M.P || (M.P = {}));
-    var P = M.P;
+    })(P = M.P || (M.P = {}));
 })(M || (M = {}));
 
 

tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js

@@ -7,10 +7,10 @@ export module M {
 }
 
 //// [declarationEmit_nameConflictsWithAlias.js]
+var M;
 (function (M) {
     M.w; // Gets emitted as C.I, which is the wrong interface
-})(exports.M || (exports.M = {}));
-var M = exports.M;
+})(M = exports.M || (exports.M = {}));
 
 
 //// [declarationEmit_nameConflictsWithAlias.d.ts]

tests/baselines/reference/decrementOperatorWithAnyOtherType.types

@@ -15,7 +15,7 @@ var obj = {x:1,y:null};
 >obj : { x: number; y: any; }
 >{x:1,y:null} : { x: number; y: null; }
 >x : number
->y : any
+>y : null
 
 class A {
 >A : A

tests/baselines/reference/defaultArgsForwardReferencing.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/compiler/defaultArgsForwardReferencing.ts (12 errors) ====
+==== tests/cases/compiler/defaultArgsForwardReferencing.ts (10 errors) ====
     function left(a, b = a, c = b) {
         a;
         b;
@@ -37,11 +37,7 @@
     }
     
     function defaultArgFunction(a = function () { return b; }, b = 1) { }
-                                                         ~
-!!! Initializer of parameter 'a' cannot reference identifier 'b' declared after it.
     function defaultArgArrow(a = () => () => b, b = 3) { }
-                                             ~
-!!! Initializer of parameter 'a' cannot reference identifier 'b' declared after it.
     
     class C {
         constructor(a = b, b = 1) { }

tests/baselines/reference/defaultArgsInFunctionExpressions.errors.txt

@@ -22,7 +22,7 @@
     // Contextually type the default arg with the type annotation
     var f3 = function (a: (s: string) => any = (s) => <number>s) { };
                                                       ~~~~~~~~~
-!!! Neither type 'number' nor type 'string' is assignable to the other.
+!!! Neither type 'string' nor type 'number' is assignable to the other.
     
     // Type check using the function's contextual type
     var f4: (a: number) => void = function (a = "") { };
@@ -32,7 +32,7 @@
     // Contextually type the default arg using the function's contextual type
     var f5: (a: (s: string) => any) => void = function (a = s => <number>s) { };
                                                                  ~~~~~~~~~
-!!! Neither type 'number' nor type 'string' is assignable to the other.
+!!! Neither type 'string' nor type 'number' is assignable to the other.
     
     // Instantiated module
     module T { }

tests/baselines/reference/derivedInterfaceDoesNotHideBaseSignatures.js

@@ -0,0 +1,13 @@
+//// [derivedInterfaceDoesNotHideBaseSignatures.ts]
+// Derived interfaces no longer hide signatures from base types, so these signatures are always compatible.
+interface Base {
+    (): string;
+    new (x: string): number;
+}
+
+interface Derived extends Base {
+    (): number;
+    new (x: string): string;
+}
+
+//// [derivedInterfaceDoesNotHideBaseSignatures.js]

tests/baselines/reference/derivedInterfaceDoesNotHideBaseSignatures.types

@@ -0,0 +1,18 @@
+=== tests/cases/conformance/interfaces/interfaceDeclarations/derivedInterfaceDoesNotHideBaseSignatures.ts ===
+// Derived interfaces no longer hide signatures from base types, so these signatures are always compatible.
+interface Base {
+>Base : Base
+
+    (): string;
+    new (x: string): number;
+>x : string
+}
+
+interface Derived extends Base {
+>Derived : Derived
+>Base : Base
+
+    (): number;
+    new (x: string): string;
+>x : string
+}

tests/baselines/reference/doNotWidenAtObjectLiteralPropertyAssignment.types

@@ -26,5 +26,5 @@ var test: IIntervalTreeNode[] = [{ interval: { begin: 0 }, children: null }]; //
 >interval : { begin: number; }
 >{ begin: 0 } : { begin: number; }
 >begin : number
->children : any
+>children : null
 

tests/baselines/reference/dottedModuleName2.js

@@ -46,27 +46,27 @@ module M
 //// [dottedModuleName2.js]
 var A;
 (function (A) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 var AA;
 (function (AA) {
+    var B;
     (function (B) {
         B.x = 1;
-    })(AA.B || (AA.B = {}));
-    var B = AA.B;
+    })(B = AA.B || (AA.B = {}));
 })(AA || (AA = {}));
 var tmpOK = AA.B.x;
 var tmpError = A.B.x;
 var A;
 (function (A) {
+    var B;
     (function (B) {
+        var C;
         (function (C) {
             C.x = 1;
-        })(B.C || (B.C = {}));
-        var C = B.C;
-    })(A.B || (A.B = {}));
-    var B = A.B;
+        })(C = B.C || (B.C = {}));
+    })(B = A.B || (A.B = {}));
 })(A || (A = {}));

tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js

@@ -124,8 +124,8 @@ var Foo;
 })(Foo || (Foo = {}));
 var N;
 (function (N) {
+    var F;
     (function (F) {
         var t;
-    })(N.F || (N.F = {}));
-    var F = N.F;
+    })(F = N.F || (N.F = {}));
 })(N || (N = {}));

tests/baselines/reference/duplicateSymbolsExportMatching.js

@@ -74,10 +74,10 @@ define(["require", "exports"], function (require, exports) {
         (function (inst) {
             var t;
         })(inst || (inst = {}));
+        var inst;
         (function (inst) {
             var t;
-        })(M.inst || (M.inst = {}));
-        var inst = M.inst;
+        })(inst = M.inst || (M.inst = {}));
     })(M || (M = {}));
     // Variables of the same / different type
     var M2;
@@ -104,9 +104,9 @@ define(["require", "exports"], function (require, exports) {
             }
             return C;
         })();
+        var C;
         (function (C) {
             var t;
-        })(M.C || (M.C = {}));
-        var C = M.C;
+        })(C = M.C || (M.C = {}));
     })(M || (M = {}));
 });

tests/baselines/reference/emitMemberAccessExpression.js

@@ -29,7 +29,9 @@ module Microsoft.PeopleAtWork.Model {
 "use strict";
 var Microsoft;
 (function (Microsoft) {
+    var PeopleAtWork;
     (function (PeopleAtWork) {
+        var Model;
         (function (Model) {
             var _Person = (function () {
                 function _Person() {
@@ -40,10 +42,8 @@ var Microsoft;
                 return _Person;
             })();
             Model._Person = _Person;
-        })(PeopleAtWork.Model || (PeopleAtWork.Model = {}));
-        var Model = PeopleAtWork.Model;
-    })(Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
-    var PeopleAtWork = Microsoft.PeopleAtWork;
+        })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}));
+    })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
 })(Microsoft || (Microsoft = {}));
 //// [emitMemberAccessExpression_file1.js]
 /// <reference path="emitMemberAccessExpression_file3.ts" />
@@ -53,7 +53,9 @@ var Microsoft;
 /// <reference path="emitMemberAccessExpression_file1.ts" />
 var Microsoft;
 (function (Microsoft) {
+    var PeopleAtWork;
     (function (PeopleAtWork) {
+        var Model;
         (function (Model) {
             var KnockoutExtentions = (function () {
                 function KnockoutExtentions() {
@@ -61,8 +63,6 @@ var Microsoft;
                 return KnockoutExtentions;
             })();
             Model.KnockoutExtentions = KnockoutExtentions;
-        })(PeopleAtWork.Model || (PeopleAtWork.Model = {}));
-        var Model = PeopleAtWork.Model;
-    })(Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
-    var PeopleAtWork = Microsoft.PeopleAtWork;
+        })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}));
+    })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
 })(Microsoft || (Microsoft = {}));

tests/baselines/reference/enumConstantMembers.errors.txt

@@ -0,0 +1,24 @@
+==== tests/cases/conformance/enums/enumConstantMembers.ts (2 errors) ====
+    // Constant members allow negatives, but not decimals. Also hex literals are allowed
+    enum E1 {
+        a = 1,
+        b
+    }
+    enum E2 {
+        a = - 1,
+        b
+    }
+    enum E3 {
+        a = 0.1,
+        b // Error because 0.1 is not a constant
+        ~
+!!! Enum member must have initializer.
+    }
+    
+    declare enum E4 {
+        a = 1,
+        b = -1,
+        c = 0.1 // Not a constant
+        ~
+!!! Ambient enum elements can only have integer literal initializers.
+    }

tests/baselines/reference/enumMerging.js

@@ -150,6 +150,7 @@ var M5;
 })(M5 || (M5 = {}));
 var M6;
 (function (M6) {
+    var A;
     (function (A) {
         (function (Color) {
             Color[Color["Red"] = 0] = "Red";
@@ -157,18 +158,17 @@ var M6;
             Color[Color["Blue"] = 2] = "Blue";
         })(A.Color || (A.Color = {}));
         var Color = A.Color;
-    })(M6.A || (M6.A = {}));
-    var A = M6.A;
+    })(A = M6.A || (M6.A = {}));
 })(M6 || (M6 = {}));
 var M6;
 (function (M6) {
+    var A;
     (function (A) {
         (function (Color) {
             Color[Color["Yellow"] = 1] = "Yellow";
         })(A.Color || (A.Color = {}));
         var Color = A.Color;
-    })(M6.A || (M6.A = {}));
-    var A = M6.A;
+    })(A = M6.A || (M6.A = {}));
     var t = 1 /* Yellow */;
     t = 0 /* Red */;
 })(M6 || (M6 = {}));

tests/baselines/reference/errorWithTruncatedType.errors.txt

@@ -0,0 +1,15 @@
+==== tests/cases/compiler/errorWithTruncatedType.ts (1 errors) ====
+    
+    var x: {
+        propertyWithAnExceedinglyLongName1: string;
+        propertyWithAnExceedinglyLongName2: string;
+        propertyWithAnExceedinglyLongName3: string;
+        propertyWithAnExceedinglyLongName4: string;
+        propertyWithAnExceedinglyLongName5: string;
+    };
+    
+    // String representation of type of 'x' should be truncated in error message
+    var s: string = x;
+        ~
+!!! Type '{ propertyWithAnExceedinglyLongName1: string; propertyWithAnExceedinglyLongName2: string; propert...' is not assignable to type 'string'.
+    

tests/baselines/reference/errorWithTruncatedType.js

@@ -0,0 +1,18 @@
+//// [errorWithTruncatedType.ts]
+
+var x: {
+    propertyWithAnExceedinglyLongName1: string;
+    propertyWithAnExceedinglyLongName2: string;
+    propertyWithAnExceedinglyLongName3: string;
+    propertyWithAnExceedinglyLongName4: string;
+    propertyWithAnExceedinglyLongName5: string;
+};
+
+// String representation of type of 'x' should be truncated in error message
+var s: string = x;
+
+
+//// [errorWithTruncatedType.js]
+var x;
+// String representation of type of 'x' should be truncated in error message
+var s = x;

tests/baselines/reference/exportAssignmentMergedModule.js

@@ -39,10 +39,10 @@ var Foo;
         return a;
     }
     Foo.c = c;
+    var Test;
     (function (Test) {
         Test.answer = 42;
-    })(Foo.Test || (Foo.Test = {}));
-    var Test = Foo.Test;
+    })(Test = Foo.Test || (Foo.Test = {}));
 })(Foo || (Foo = {}));
 module.exports = Foo;
 //// [foo_1.js]

tests/baselines/reference/exportCodeGen.js

@@ -103,10 +103,10 @@ var E;
         return C;
     })();
     E.C = C;
+    var M;
     (function (M) {
         M.x = 42;
-    })(E.M || (E.M = {}));
-    var M = E.M;
+    })(M = E.M || (E.M = {}));
 })(E || (E = {}));
 // validate all exportable statements,
 // which are not exported

tests/baselines/reference/exportImportAlias.js

@@ -96,6 +96,7 @@ var X;
         return 42;
     }
     X.Y = Y;
+    var Y;
     (function (Y) {
         var Point = (function () {
             function Point(x, y) {
@@ -105,8 +106,7 @@ var X;
             return Point;
         })();
         Y.Point = Point;
-    })(X.Y || (X.Y = {}));
-    var Y = X.Y;
+    })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
 var Z;
 (function (Z) {
@@ -124,10 +124,10 @@ var K;
         return L;
     })();
     K.L = L;
+    var L;
     (function (L) {
         L.y = 12;
-    })(K.L || (K.L = {}));
-    var L = K.L;
+    })(L = K.L || (K.L = {}));
 })(K || (K = {}));
 var M;
 (function (M) {

tests/baselines/reference/exportImportAndClodule.js

@@ -29,10 +29,10 @@ var K;
         return L;
     })();
     K.L = L;
+    var L;
     (function (L) {
         L.y = 12;
-    })(K.L || (K.L = {}));
-    var L = K.L;
+    })(L = K.L || (K.L = {}));
 })(K || (K = {}));
 var M;
 (function (M) {

tests/baselines/reference/forStatementsMultipleValidDecl.types

@@ -39,7 +39,7 @@ for (var p: Point = { x: 0, y: undefined }; ;) { }
 >Point : Point
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
->y : any
+>y : undefined
 >undefined : undefined
 
 for (var p = { x: 1, y: <number>undefined }; ;) { }
@@ -65,7 +65,7 @@ for (var p = <{ x: number; y: number; }>{ x: 0, y: undefined }; ;) { }
 >y : number
 >{ x: 0, y: undefined } : { x: number; y: undefined; }
 >x : number
->y : any
+>y : undefined
 >undefined : undefined
 
 for (var p: typeof p; ;) { }

tests/baselines/reference/forgottenNew.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/compiler/forgottenNew.ts (1 errors) ====
+==== tests/cases/conformance/expressions/functionCalls/forgottenNew.ts (1 errors) ====
     module Tools {
         export class NullLogger { }
     }

tests/baselines/reference/functionImplementations.types

@@ -253,8 +253,8 @@ function opt2(n = { x: null, y: undefined }) {
 >opt2 : (n?: { x: any; y: any; }) => void
 >n : { x: any; y: any; }
 >{ x: null, y: undefined } : { x: null; y: undefined; }
->x : any
->y : any
+>x : null
+>y : undefined
 >undefined : undefined
 
     var m = n;

tests/baselines/reference/functionMergedWithModule.js

@@ -20,20 +20,20 @@ function foo(title) {
 }
 var foo;
 (function (foo) {
+    var Bar;
     (function (Bar) {
         function f() {
         }
         Bar.f = f;
-    })(foo.Bar || (foo.Bar = {}));
-    var Bar = foo.Bar;
+    })(Bar = foo.Bar || (foo.Bar = {}));
 })(foo || (foo = {}));
 var foo;
 (function (foo) {
+    var Baz;
     (function (Baz) {
         function g() {
             foo.Bar.f();
         }
         Baz.g = g;
-    })(foo.Baz || (foo.Baz = {}));
-    var Baz = foo.Baz;
+    })(Baz = foo.Baz || (foo.Baz = {}));
 })(foo || (foo = {}));

tests/baselines/reference/fuzzy.errors.txt

@@ -32,7 +32,8 @@
             worksToo():R {
                 return <R>({ oneI: this });
                        ~~~~~~~~~~~~~~~~~~~
-!!! Neither type 'R' nor type '{ oneI: C; }' is assignable to the other.
+!!! Neither type '{ oneI: C; }' nor type 'R' is assignable to the other:
+!!!   Property 'anything' is missing in type '{ oneI: C; }'.
             }
         }
     }

tests/baselines/reference/genericCallWithFunctionTypedArguments5.errors.txt

@@ -10,9 +10,9 @@
     // more args not allowed
     var r2 = foo({ cb: <T>(x: T, y: T) => '' }); // error
                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Argument of type '{ cb: <T>(x: T, y: T) => string; }' is not assignable to parameter of type '{ cb: (t: any) => string; }'.
+!!! Argument of type '{ cb: <T>(x: T, y: T) => string; }' is not assignable to parameter of type '{ cb: (t: {}) => string; }'.
 !!!   Types of property 'cb' are incompatible:
-!!!     Type '<T>(x: T, y: T) => string' is not assignable to type '(t: any) => string'.
+!!!     Type '<T>(x: T, y: T) => string' is not assignable to type '(t: {}) => string'.
     var r3 = foo({ cb: (x: string, y: number) => '' }); // error
                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! Argument of type '{ cb: (x: string, y: number) => string; }' is not assignable to parameter of type '{ cb: (t: string) => string; }'.

tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js

@@ -84,7 +84,9 @@ var __extends = this.__extends || function (d, b) {
 };
 var Portal;
 (function (Portal) {
+    var Controls;
     (function (Controls) {
+        var Validators;
         (function (Validators) {
             var Validator = (function () {
                 function Validator(message) {
@@ -97,15 +99,16 @@ var Portal;
                 return Validator;
             })();
             Validators.Validator = Validator;
-        })(Controls.Validators || (Controls.Validators = {}));
-        var Validators = Controls.Validators;
-    })(Portal.Controls || (Portal.Controls = {}));
-    var Controls = Portal.Controls;
+        })(Validators = Controls.Validators || (Controls.Validators = {}));
+    })(Controls = Portal.Controls || (Portal.Controls = {}));
 })(Portal || (Portal = {}));
 var PortalFx;
 (function (PortalFx) {
+    var ViewModels;
     (function (ViewModels) {
+        var Controls;
         (function (Controls) {
+            var Validators;
             (function (Validators) {
                 var Validator = (function (_super) {
                     __extends(Validator, _super);
@@ -115,12 +118,9 @@ var PortalFx;
                     return Validator;
                 })(Portal.Controls.Validators.Validator);
                 Validators.Validator = Validator;
-            })(Controls.Validators || (Controls.Validators = {}));
-            var Validators = Controls.Validators;
-        })(ViewModels.Controls || (ViewModels.Controls = {}));
-        var Controls = ViewModels.Controls;
-    })(PortalFx.ViewModels || (PortalFx.ViewModels = {}));
-    var ViewModels = PortalFx.ViewModels;
+            })(Validators = Controls.Validators || (Controls.Validators = {}));
+        })(Controls = ViewModels.Controls || (ViewModels.Controls = {}));
+    })(ViewModels = PortalFx.ViewModels || (PortalFx.ViewModels = {}));
 })(PortalFx || (PortalFx = {}));
 var ViewModel = (function () {
     function ViewModel() {