From 6a8e78cdc08ea1c8b4b1b9654638b9517153ef56 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <t-weswig@microsoft.com>
Date: Mon, 23 Nov 2015 12:43:28 -0800
Subject: [PATCH] fix ES6 emit for namespaces to only emit one export binding

---
 src/compiler/emitter.ts                       | 19 +++++++++++--------
 .../es6ModuleInternalNamedImports2.js         |  1 -
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index bdeac582bbf..83d3e24351e 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -6318,15 +6318,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 const emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
 
                 if (emitVarForModule) {
-                    emitStart(node);
-                    if (isES6ExportedDeclaration(node)) {
-                        write("export ");
+                    const isES6ExportedNamespace = isES6ExportedDeclaration(node);
+                    if ((!isES6ExportedNamespace) || !forEach(node.symbol && node.symbol.declarations, declaration => declaration.kind === SyntaxKind.ModuleDeclaration && declaration.pos < node.pos)) {
+                        emitStart(node);
+                        if (isES6ExportedNamespace) {
+                            write("export ");
+                        }
+                        write("var ");
+                        emit(node.name);
+                        write(";");
+                        emitEnd(node);
+                        writeLine();
                     }
-                    write("var ");
-                    emit(node.name);
-                    write(";");
-                    emitEnd(node);
-                    writeLine();
                 }
 
                 emitStart(node);
diff --git a/tests/baselines/reference/es6ModuleInternalNamedImports2.js b/tests/baselines/reference/es6ModuleInternalNamedImports2.js
index 9dee8153e56..98226a1e52b 100644
--- a/tests/baselines/reference/es6ModuleInternalNamedImports2.js
+++ b/tests/baselines/reference/es6ModuleInternalNamedImports2.js
@@ -58,7 +58,6 @@ export var M;
     // alias
     M.M_A = M_M;
 })(M || (M = {}));
-export var M;
 (function (M) {
     // Reexports
     export { M_V as v };