From ec17f369a2acd19a18bcd6e63327c36634093eac Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 2 Dec 2014 14:14:57 -0800
Subject: [PATCH] Find imported external modules that start with double
 underscores.

---
 src/compiler/checker.ts                       | 16 +++++---
 ...oduleReferenceDoubleUnderscore1.errors.txt | 22 -----------
 ...rnalModuleReferenceDoubleUnderscore1.types | 37 +++++++++++++++++++
 3 files changed, 47 insertions(+), 28 deletions(-)
 delete mode 100644 tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.errors.txt
 create mode 100644 tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 4fdab0a44a..9b6af72eb5 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -545,14 +545,18 @@ module ts {
             return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\";
         }
 
-        function resolveExternalModuleName(location: Node, moduleExpression: Expression): Symbol {
-            if (moduleExpression.kind !== SyntaxKind.StringLiteral) {
+        function resolveExternalModuleName(location: Node, moduleReferenceExpression: Expression): Symbol {
+            if (moduleReferenceExpression.kind !== SyntaxKind.StringLiteral) {
                 return;
             }
 
-            var moduleLiteral = <LiteralExpression>moduleExpression;
+            var moduleReferenceLiteral = <LiteralExpression>moduleReferenceExpression;
             var searchPath = getDirectoryPath(getSourceFile(location).filename);
-            var moduleName = moduleLiteral.text;
+
+            // Module names are escaped in our symbol table.  However, string literal values aren't.
+            // Escape the name in the "require(...)" clause to ensure we find the right symbol.
+            var moduleName = escapeIdentifier(moduleReferenceLiteral.text);
+
             if (!moduleName) return;
             var isRelative = isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
@@ -573,10 +577,10 @@ module ts {
                 if (sourceFile.symbol) {
                     return getResolvedExportSymbol(sourceFile.symbol);
                 }
-                error(moduleLiteral, Diagnostics.File_0_is_not_an_external_module, sourceFile.filename);
+                error(moduleReferenceLiteral, Diagnostics.File_0_is_not_an_external_module, sourceFile.filename);
                 return;
             }
-            error(moduleLiteral, Diagnostics.Cannot_find_external_module_0, moduleName);
+            error(moduleReferenceLiteral, Diagnostics.Cannot_find_external_module_0, moduleName);
         }
 
         function getResolvedExportSymbol(moduleSymbol: Symbol): Symbol {
diff --git a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.errors.txt b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.errors.txt
deleted file mode 100644
index 80e2725d69..0000000000
--- a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-tests/cases/compiler/externalModuleReferenceDoubleUnderscore1.ts(2,29): error TS2307: Cannot find external module '__timezonecomplete/basics'.
-
-
-==== tests/cases/compiler/externalModuleReferenceDoubleUnderscore1.ts (1 errors) ====
-    declare module 'timezonecomplete' {
-        import basics = require("__timezonecomplete/basics");
-                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find external module '__timezonecomplete/basics'.
-        export import TimeUnit = basics.TimeUnit;
-    }
-    
-    declare module '__timezonecomplete/basics' {
-        export enum TimeUnit {
-            Second = 0,
-            Minute = 1,
-            Hour = 2,
-            Day = 3,
-            Week = 4,
-            Month = 5,
-            Year = 6,
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types
new file mode 100644
index 0000000000..e255e64d46
--- /dev/null
+++ b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.types
@@ -0,0 +1,37 @@
+=== tests/cases/compiler/externalModuleReferenceDoubleUnderscore1.ts ===
+declare module 'timezonecomplete' {
+    import basics = require("__timezonecomplete/basics");
+>basics : typeof basics
+
+    export import TimeUnit = basics.TimeUnit;
+>TimeUnit : typeof basics.TimeUnit
+>basics : typeof basics
+>TimeUnit : basics.TimeUnit
+}
+
+declare module '__timezonecomplete/basics' {
+    export enum TimeUnit {
+>TimeUnit : TimeUnit
+
+        Second = 0,
+>Second : TimeUnit
+
+        Minute = 1,
+>Minute : TimeUnit
+
+        Hour = 2,
+>Hour : TimeUnit
+
+        Day = 3,
+>Day : TimeUnit
+
+        Week = 4,
+>Week : TimeUnit
+
+        Month = 5,
+>Month : TimeUnit
+
+        Year = 6,
+>Year : TimeUnit
+    }
+}