addressed PR feedback

vladima · vladima · commit adacad326a3d · 2016-01-26T21:38:12.000-08:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -258,7 +258,7 @@ namespace ts {
                 "classic": ModuleResolutionKind.Classic,
             },
             description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
-            error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_classic_or_baseUrl,
+            error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic,
         },
         {
             name: "allowUnusedLabels",
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2367,7 +2367,7 @@
         "category": "Error",
         "code": 6062
     },
-    "Argument for '--moduleResolution' option must be 'node', 'classic' or 'baseUrl'.": {
+    "Argument for '--moduleResolution' option must be 'node' or 'classic'.": {
         "category": "Error",
         "code": 6063
     },
@@ -2515,49 +2515,45 @@
         "category": "Message",
         "code": 6101
     },
-    "Module name '{0}' contains '!' character.": {
-        "category": "Message",
-        "code": 6102
-    },
     "Allow javascript files to be compiled.": {
         "category": "Message",
-        "code": 6103
+        "code": 6102
     },
     "Option '{0}' should have array of strings as a value.": {
         "category": "Error",
-        "code": 6104
+        "code": 6103
     },
     "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'.": {
         "category": "Message",
-        "code": 6105
+        "code": 6104
     },
     "Expected type of 'typings' field in 'package.json' to be 'string', got '{0}'.": {
         "category": "Message",
-        "code": 6106
+        "code": 6105
     },
     "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'": {
         "category": "Message",
-        "code": 6107
+        "code": 6106
     },
     "'rootDirs' option is set, using it to resolve relative module name '{0}'": {
         "category": "Message",
-        "code": 6108
+        "code": 6107
     },
     "Longest matching prefix for '{0}' is '{1}'": {
         "category": "Message",
-        "code": 6109
+        "code": 6108
     },
     "Loading '{0}' from the root dir '{1}', candidate location '{2}'": {
         "category": "Message",
-        "code": 6110
+        "code": 6109
     },
     "Trying other entries in 'rootDirs'": {
         "category": "Message",
-        "code": 6111
+        "code": 6110
     },
     "Module resolution using 'rootDirs' has failed": {
         "category": "Message",
-        "code": 6112
+        "code": 6111
     },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -527,14 +527,6 @@ namespace ts {
             return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/false, failedLookupLocations);
         }
 
-        // module names that contain '!' are used to reference resources and are not resolved to actual files on disk
-        if (moduleName.indexOf("!") != -1) {
-            if (traceEnabled) {
-                trace(host, Diagnostics.Module_name_0_contains_character, moduleName);
-            }
-            return { resolvedModule: undefined, failedLookupLocations: [] };
-        }
-
         let referencedSourceFile: string;
         while (true) {
             const searchName = normalizePath(combinePaths(containingDirectory, moduleName));

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ namespace ts {`
`258`	`258`	`"classic": ModuleResolutionKind.Classic,`
`259`	`259`	`},`
`260`	`260`	`description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,`
`261`		`- error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_classic_or_baseUrl,`
	`261`	`+ error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic,`
`262`	`262`	`},`
`263`	`263`	`{`
`264`	`264`	`name: "allowUnusedLabels",`