From 3b6fa314da2a1cac1dedc4e83a056e7ce8ab334e Mon Sep 17 00:00:00 2001
From: Wesley Wigham <t-weswig@microsoft.com>
Date: Mon, 23 Nov 2015 13:12:34 -0800
Subject: [PATCH] new tests

---
 src/compiler/emitter.ts                       |  2 +-
 .../reference/enumExportMergingES6.js         | 23 +++++++++++++++++
 .../reference/enumExportMergingES6.symbols    | 22 ++++++++++++++++
 .../reference/enumExportMergingES6.types      | 25 +++++++++++++++++++
 .../conformance/enums/enumExportMergingES6.ts | 10 ++++++++
 5 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/enumExportMergingES6.js
 create mode 100644 tests/baselines/reference/enumExportMergingES6.symbols
 create mode 100644 tests/baselines/reference/enumExportMergingES6.types
 create mode 100644 tests/cases/conformance/enums/enumExportMergingES6.ts

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f31885dcd03..64af2c71442 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -6208,7 +6208,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     // do not emit var if variable was already hoisted
 
                     const isES6ExportedEnum = isES6ExportedDeclaration(node);
-                    if (!(node.flags & NodeFlags.Export) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, SyntaxKind.ModuleDeclaration))) {
+                    if ((!(node.flags & NodeFlags.Export)) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, SyntaxKind.EnumDeclaration))) {
                         emitStart(node);
                         if (isES6ExportedEnum) {
                             write("export ");
diff --git a/tests/baselines/reference/enumExportMergingES6.js b/tests/baselines/reference/enumExportMergingES6.js
new file mode 100644
index 00000000000..7a5ea5f2718
--- /dev/null
+++ b/tests/baselines/reference/enumExportMergingES6.js
@@ -0,0 +1,23 @@
+//// [enumExportMergingES6.ts]
+export enum Animals {
+	Cat = 1
+}
+export enum Animals {
+	Dog = 2
+}
+export enum Animals {
+	CatDog = Cat | Dog
+}
+
+
+//// [enumExportMergingES6.js]
+export var Animals;
+(function (Animals) {
+    Animals[Animals["Cat"] = 1] = "Cat";
+})(Animals || (Animals = {}));
+(function (Animals) {
+    Animals[Animals["Dog"] = 2] = "Dog";
+})(Animals || (Animals = {}));
+(function (Animals) {
+    Animals[Animals["CatDog"] = 3] = "CatDog";
+})(Animals || (Animals = {}));
diff --git a/tests/baselines/reference/enumExportMergingES6.symbols b/tests/baselines/reference/enumExportMergingES6.symbols
new file mode 100644
index 00000000000..66fc31c5e18
--- /dev/null
+++ b/tests/baselines/reference/enumExportMergingES6.symbols
@@ -0,0 +1,22 @@
+=== tests/cases/conformance/enums/enumExportMergingES6.ts ===
+export enum Animals {
+>Animals : Symbol(Animals, Decl(enumExportMergingES6.ts, 0, 0), Decl(enumExportMergingES6.ts, 2, 1), Decl(enumExportMergingES6.ts, 5, 1))
+
+	Cat = 1
+>Cat : Symbol(Animals.Cat, Decl(enumExportMergingES6.ts, 0, 21))
+}
+export enum Animals {
+>Animals : Symbol(Animals, Decl(enumExportMergingES6.ts, 0, 0), Decl(enumExportMergingES6.ts, 2, 1), Decl(enumExportMergingES6.ts, 5, 1))
+
+	Dog = 2
+>Dog : Symbol(Animals.Dog, Decl(enumExportMergingES6.ts, 3, 21))
+}
+export enum Animals {
+>Animals : Symbol(Animals, Decl(enumExportMergingES6.ts, 0, 0), Decl(enumExportMergingES6.ts, 2, 1), Decl(enumExportMergingES6.ts, 5, 1))
+
+	CatDog = Cat | Dog
+>CatDog : Symbol(Animals.CatDog, Decl(enumExportMergingES6.ts, 6, 21))
+>Cat : Symbol(Animals.Cat, Decl(enumExportMergingES6.ts, 0, 21))
+>Dog : Symbol(Animals.Dog, Decl(enumExportMergingES6.ts, 3, 21))
+}
+
diff --git a/tests/baselines/reference/enumExportMergingES6.types b/tests/baselines/reference/enumExportMergingES6.types
new file mode 100644
index 00000000000..da2fc22cb8a
--- /dev/null
+++ b/tests/baselines/reference/enumExportMergingES6.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/enums/enumExportMergingES6.ts ===
+export enum Animals {
+>Animals : Animals
+
+	Cat = 1
+>Cat : Animals
+>1 : number
+}
+export enum Animals {
+>Animals : Animals
+
+	Dog = 2
+>Dog : Animals
+>2 : number
+}
+export enum Animals {
+>Animals : Animals
+
+	CatDog = Cat | Dog
+>CatDog : Animals
+>Cat | Dog : number
+>Cat : Animals
+>Dog : Animals
+}
+
diff --git a/tests/cases/conformance/enums/enumExportMergingES6.ts b/tests/cases/conformance/enums/enumExportMergingES6.ts
new file mode 100644
index 00000000000..0a5185ecdd5
--- /dev/null
+++ b/tests/cases/conformance/enums/enumExportMergingES6.ts
@@ -0,0 +1,10 @@
+// @target: es6
+export enum Animals {
+	Cat = 1
+}
+export enum Animals {
+	Dog = 2
+}
+export enum Animals {
+	CatDog = Cat | Dog
+}