Corrected codegen to support shadowed module names.

Author: ahejlsberg

src/compiler/emitter.ts

@@ -1755,16 +1755,13 @@ module ts {
                 if (!isInstantiated(node)) {
                     return emitPinnedOrTripleSlashComments(node);
                 }
-
                 emitLeadingComments(node);
-                if (!(node.flags & NodeFlags.Export)) {
-                    emitStart(node);
-                    write("var ");
-                    emit(node.name);
-                    write(";");
-                    emitEnd(node);
-                    writeLine();
-                }
+                emitStart(node);
+                write("var ");
+                emit(node.name);
+                write(";");
+                emitEnd(node);
+                writeLine();
                 emitStart(node);
                 write("(function (");
                 emitStart(node.name);
@@ -1788,21 +1785,15 @@ module ts {
                     scopeEmitEnd();
                 }
                 write(")(");
+                if (node.flags & NodeFlags.Export) {
+                    emit(node.name);
+                    write(" = ");
+                }
                 emitModuleMemberName(node);
                 write(" || (");
                 emitModuleMemberName(node);
                 write(" = {}));");
                 emitEnd(node);
-                if (node.flags & NodeFlags.Export) {
-                    writeLine();
-                    emitStart(node);
-                    write("var ");
-                    emit(node.name);
-                    write(" = ");
-                    emitModuleMemberName(node);
-                    emitEnd(node);
-                    write(";");
-                }
                 emitTrailingComments(node);
             }
 

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;