From 843d3ec7ca47047aa667158941bc3dd33ec4399d Mon Sep 17 00:00:00 2001
From: Gabriel Isenberg <gisenberg@gmail.com>
Date: Thu, 13 Nov 2014 10:16:46 -0800
Subject: [PATCH] Added a compiler test for named AMD modules.

---
 src/compiler/emitter.ts                       |  6 +----
 tests/baselines/reference/amdModuleName1.js   | 22 +++++++++++++++++++
 .../baselines/reference/amdModuleName1.types  | 19 ++++++++++++++++
 tests/cases/compiler/amdModuleName1.ts        |  9 ++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/amdModuleName1.js
 create mode 100644 tests/baselines/reference/amdModuleName1.types
 create mode 100644 tests/cases/compiler/amdModuleName1.ts

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index fe98d308b86..4dfce94c928 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2097,14 +2097,10 @@ module ts {
                 var imports = getExternalImportDeclarations(node);
                 writeLine();
                 write("define(");
-                
                 if(node.amdModuleName) {
-                    write("\"" + node.amdModuleName + "\"");
-                    write(", ");
+                    write("\"" + node.amdModuleName + "\", ");
                 }
-
                 write("[\"require\", \"exports\"");
-
                 forEach(imports, imp => {
                     write(", ");
                     emitLiteral(imp.externalModuleName);
diff --git a/tests/baselines/reference/amdModuleName1.js b/tests/baselines/reference/amdModuleName1.js
new file mode 100644
index 00000000000..e3505a007e3
--- /dev/null
+++ b/tests/baselines/reference/amdModuleName1.js
@@ -0,0 +1,22 @@
+//// [amdModuleName1.ts]
+///<amd-module name='NamedModule'/>
+class Foo {
+    x: number;
+    constructor() {
+        this.x = 5;
+    }
+}
+export = Foo;
+
+
+//// [amdModuleName1.js]
+define("NamedModule", ["require", "exports"], function (require, exports) {
+    ///<amd-module name='NamedModule'/>
+    var Foo = (function () {
+        function Foo() {
+            this.x = 5;
+        }
+        return Foo;
+    })();
+    return Foo;
+});
diff --git a/tests/baselines/reference/amdModuleName1.types b/tests/baselines/reference/amdModuleName1.types
new file mode 100644
index 00000000000..02ad9472354
--- /dev/null
+++ b/tests/baselines/reference/amdModuleName1.types
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/amdModuleName1.ts ===
+///<amd-module name='NamedModule'/>
+class Foo {
+>Foo : Foo
+
+    x: number;
+>x : number
+
+    constructor() {
+        this.x = 5;
+>this.x = 5 : number
+>this.x : number
+>this : Foo
+>x : number
+    }
+}
+export = Foo;
+>Foo : Foo
+
diff --git a/tests/cases/compiler/amdModuleName1.ts b/tests/cases/compiler/amdModuleName1.ts
new file mode 100644
index 00000000000..fef7956e332
--- /dev/null
+++ b/tests/cases/compiler/amdModuleName1.ts
@@ -0,0 +1,9 @@
+//@module: amd
+///<amd-module name='NamedModule'/>
+class Foo {
+    x: number;
+    constructor() {
+        this.x = 5;
+    }
+}
+export = Foo;