From 9974526101a4e28c2707ba0390b35ea086549d11 Mon Sep 17 00:00:00 2001
From: togru <v3nomzxgt8@gmail.com>
Date: Thu, 5 Feb 2015 12:07:00 +0100
Subject: [PATCH] updated code style, added tests, fixed regex bug, merged to
 latest branch

---
 .gitignore                                           |  1 +
 src/compiler/emitter.ts                              |  8 +++++++-
 src/compiler/parser.ts                               | 12 +++++++++---
 src/compiler/types.ts                                |  2 +-
 src/services/services.ts                             |  2 +-
 .../reference/amdDependencyCommentName1.errors.txt   | 10 ++++++++++
 .../baselines/reference/amdDependencyCommentName1.js | 10 ++++++++++
 .../reference/amdDependencyCommentName2.errors.txt   | 10 ++++++++++
 .../baselines/reference/amdDependencyCommentName2.js | 11 +++++++++++
 tests/cases/compiler/amdDependencyCommentName1.ts    |  5 +++++
 tests/cases/compiler/amdDependencyCommentName2.ts    |  5 +++++
 11 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 tests/baselines/reference/amdDependencyCommentName1.errors.txt
 create mode 100644 tests/baselines/reference/amdDependencyCommentName1.js
 create mode 100644 tests/baselines/reference/amdDependencyCommentName2.errors.txt
 create mode 100644 tests/baselines/reference/amdDependencyCommentName2.js
 create mode 100644 tests/cases/compiler/amdDependencyCommentName1.ts
 create mode 100644 tests/cases/compiler/amdDependencyCommentName2.ts

diff --git a/.gitignore b/.gitignore
index 57e8804d7c3..c54c8018ea8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ scripts/ior.js
 scripts/*.js.map
 coverage/
 internal/
+**/.DS_Store
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index a4521977802..ebd9f3b25cc 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3916,7 +3916,7 @@ module ts {
                     emitLiteral(<LiteralExpression>getExternalModuleImportDeclarationExpression(imp));
                 });
                 forEach(node.amdDependencies, amdDependency => {
-                    var text = "\"" + amdDependency + "\"";
+                    var text = "\"" + amdDependency.path + "\"";
                     write(", ");
                     write(text);
                 });
@@ -3925,6 +3925,12 @@ module ts {
                     write(", ");
                     emit(imp.name);
                 });
+                forEach(node.amdDependencies, amdDependency => {
+                    if (amdDependency.name) {
+                        write(", ");
+                        write(amdDependency.name);
+                    }
+                });
                 write(") {");
                 increaseIndent();
                 emitCaptureThisForNodeIfNecessary(node);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 866d66d5151..373c3782411 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -4670,7 +4670,7 @@ module ts {
         function processReferenceComments(sourceFile: SourceFile): void {
             var triviaScanner = createScanner(sourceFile.languageVersion, /*skipTrivia*/false, sourceText);
             var referencedFiles: FileReference[] = [];
-            var amdDependencies: string[] = [];
+            var amdDependencies: {path: string; name: string}[] = [];
             var amdModuleName: string;
 
             // Keep scanning all the leading trivia in the file until we get to something that 
@@ -4710,10 +4710,16 @@ module ts {
                         amdModuleName = amdModuleNameMatchResult[2];
                     }
 
-                    var amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s+path\s*=\s*('|")(.+?)\1/gim;
+                    var amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s/gim;
+                    var pathRegex = /\spath\s*=\s*('|")(.+?)\1/gim;
+                    var nameRegex = /\sname\s*=\s*('|")(.+?)\1/gim;
                     var amdDependencyMatchResult = amdDependencyRegEx.exec(comment);
                     if (amdDependencyMatchResult) {
-                        amdDependencies.push(amdDependencyMatchResult[2]);
+                        var pathMatchResult = pathRegex.exec(comment);
+                        var nameMatchResult = nameRegex.exec(comment);
+                        if (pathMatchResult) {
+                            amdDependencies.push({path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined });
+                        }
                     }
                 }
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ff8f5d2ed48..a7d7ab0939b 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -887,7 +887,7 @@ module ts {
         fileName: string;
         text: string;
 
-        amdDependencies: string[];
+        amdDependencies: {path: string; name: string}[];
         amdModuleName: string;
         referencedFiles: FileReference[];
 
diff --git a/src/services/services.ts b/src/services/services.ts
index 677af16bdc4..d499f8fec53 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -726,7 +726,7 @@ module ts {
         public statements: NodeArray<Statement>;
         public endOfFileToken: Node;
 
-        public amdDependencies: string[];
+        public amdDependencies: {name: string; path: string}[];
         public amdModuleName: string;
         public referencedFiles: FileReference[];
 
diff --git a/tests/baselines/reference/amdDependencyCommentName1.errors.txt b/tests/baselines/reference/amdDependencyCommentName1.errors.txt
new file mode 100644
index 00000000000..081c86b25e9
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyCommentName1.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find external module 'm2'.
+
+
+==== tests/cases/compiler/amdDependencyCommentName1.ts (1 errors) ====
+    ///<amd-dependency path='bar' name='b'/>
+    
+    import m1 = require("m2")
+                        ~~~~
+!!! error TS2307: Cannot find external module 'm2'.
+    m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js
new file mode 100644
index 00000000000..03336536378
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyCommentName1.js
@@ -0,0 +1,10 @@
+//// [amdDependencyCommentName1.ts]
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
+
+//// [amdDependencyCommentName1.js]
+///<amd-dependency path='bar' name='b'/>
+var m1 = require("m2");
+m1.f();
diff --git a/tests/baselines/reference/amdDependencyCommentName2.errors.txt b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
new file mode 100644
index 00000000000..137f9335ff7
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find external module 'm2'.
+
+
+==== tests/cases/compiler/amdDependencyCommentName2.ts (1 errors) ====
+    ///<amd-dependency path='bar' name='b'/>
+    
+    import m1 = require("m2")
+                        ~~~~
+!!! error TS2307: Cannot find external module 'm2'.
+    m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
new file mode 100644
index 00000000000..d923df80195
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyCommentName2.js
@@ -0,0 +1,11 @@
+//// [amdDependencyCommentName2.ts]
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
+
+//// [amdDependencyCommentName2.js]
+///<amd-dependency path='bar' name='b'/>
+define(["require", "exports", "m2", "bar"], function (require, exports, m1, b) {
+    m1.f();
+});
diff --git a/tests/cases/compiler/amdDependencyCommentName1.ts b/tests/cases/compiler/amdDependencyCommentName1.ts
new file mode 100644
index 00000000000..958d7ff825f
--- /dev/null
+++ b/tests/cases/compiler/amdDependencyCommentName1.ts
@@ -0,0 +1,5 @@
+//@module: commonjs
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
\ No newline at end of file
diff --git a/tests/cases/compiler/amdDependencyCommentName2.ts b/tests/cases/compiler/amdDependencyCommentName2.ts
new file mode 100644
index 00000000000..6cd7d5531f1
--- /dev/null
+++ b/tests/cases/compiler/amdDependencyCommentName2.ts
@@ -0,0 +1,5 @@
+//@module: amd
+///<amd-dependency path='bar' name='b'/>
+
+import m1 = require("m2")
+m1.f();
\ No newline at end of file