Merge pull request microsoft#15350 from Microsoft/improve-message-for-untyped-module

sandersn · web-flow · commit da5fd936e6db · 2017-04-24T16:13:27.000-07:00
Improve message for untyped module with noImplicitAny
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1641,10 +1641,14 @@ namespace ts {
                     error(errorNode, diag, moduleReference, resolvedModule.resolvedFileName);
                 }
                 else if (noImplicitAny && moduleNotFoundError) {
-                    error(errorNode,
+                    let errorInfo = chainDiagnosticMessages(/*details*/ undefined,
+                        Diagnostics.Try_npm_install_types_Slash_0_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_module_0,
+                        moduleReference);
+                    errorInfo = chainDiagnosticMessages(errorInfo,
                         Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type,
                         moduleReference,
                         resolvedModule.resolvedFileName);
+                    diagnostics.add(createDiagnosticForNodeFromMessageChain(errorNode, errorInfo));
                 }
                 // Failed imports and untyped modules are both treated in an untyped manner; only difference is whether we give a diagnostic first.
                 return undefined;
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -3310,6 +3310,10 @@
         "category": "Error",
         "code": 7034
     },
+    "Try `npm install @types/{0}` if it exists or add a new declaration (.d.ts) file containing `declare module '{0}';`": {
+        "category": "Error",
+        "code": 7035
+    },
     "You cannot rename this element.": {
         "category": "Error",
         "code": 8000
diff --git a/tests/baselines/reference/untypedModuleImport_noImplicitAny.errors.txt b/tests/baselines/reference/untypedModuleImport_noImplicitAny.errors.txt
@@ -1,10 +1,12 @@
 /a.ts(1,22): error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
+  Try `npm install @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
 
 
 ==== /a.ts (1 errors) ====
     import * as foo from "foo";
                          ~~~~~
 !!! error TS7016: Could not find a declaration file for module 'foo'. '/node_modules/foo/index.js' implicitly has an 'any' type.
+!!! error TS7016:   Try `npm install @types/foo` if it exists or add a new declaration (.d.ts) file containing `declare module 'foo';`
     
 ==== /node_modules/foo/index.js (0 errors) ====
     // This tests that `--noImplicitAny` disables untyped modules.
