Convert 'installTypesForPackge' refactor to a suggestion

Author: Andy Hanson

src/compiler/checker.ts

@@ -2096,14 +2096,7 @@ namespace ts {
                     error(errorNode, diag, moduleReference, resolvedModule.resolvedFileName);
                 }
                 else if (noImplicitAny && moduleNotFoundError) {
-                    let errorInfo = resolvedModule.packageId && 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,
-                        getMangledNameForScopedPackage(resolvedModule.packageId.name));
-                    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));
+                    diagnostics.add(createDiagnosticForModuleMissingTypes(errorNode, resolvedModule, moduleReference, Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type));
                 }
                 // Failed imports and untyped modules are both treated in an untyped manner; only difference is whether we give a diagnostic first.
                 return undefined;

src/compiler/diagnosticMessages.json

@@ -3818,6 +3818,10 @@
         "category": "Suggestion",
         "code": 80001
     },
+    "Did not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type.": {
+        "category": "Suggestion",
+        "code": 80002
+    },
 
     "Add missing 'super()' call": {
         "category": "Message",

src/compiler/program.ts

@@ -2416,10 +2416,26 @@ namespace ts {
             return options.jsx ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
         }
         function needAllowJs() {
-            return options.allowJs || !getStrictOptionValue(options, "noImplicitAny") ? undefined : Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;
+            return willAllowImplicitAnyJsModule(options) ? undefined : Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;
         }
     }
 
+    export function willAllowImplicitAnyJsModule(options: CompilerOptions): boolean {
+        return options.allowJs || !getStrictOptionValue(options, "noImplicitAny");
+    }
+
+    export function createDiagnosticForModuleMissingTypes(errorNode: Node, { packageId, resolvedFileName }: ResolvedModuleFull, moduleReference: string, diag: DiagnosticMessage): Diagnostic {
+        const errorInfo = packageId && 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,
+            getMangledNameForScopedPackage(packageId.name));
+        return createDiagnosticForNodeFromMessageChain(errorNode, chainDiagnosticMessages(
+            errorInfo,
+            diag,
+            moduleReference,
+            resolvedFileName));
+    }
+
     function checkAllDefined(names: string[]): string[] {
         Debug.assert(names.every(name => name !== undefined), "A name is undefined.", () => JSON.stringify(names));
         return names;

src/harness/fourslash.ts

@@ -583,7 +583,8 @@ namespace FourSlash {
 
         public verifyNoErrors() {
             ts.forEachKey(this.inputFiles, fileName => {
-                if (!ts.isAnySupportedFileExtension(fileName)) return;
+                if (!ts.isAnySupportedFileExtension(fileName)
+                    || !this.getProgram().getCompilerOptions().allowJs && !ts.extensionIsTypeScript(ts.extensionFromPath(fileName))) return;
                 const errors = this.getDiagnostics(fileName).filter(e => e.category !== ts.DiagnosticCategory.Suggestion);
                 if (errors.length) {
                     this.printErrorLog(/*expectErrors*/ false, errors);

src/services/codefixes/fixCannotFindModule.ts

@@ -1,7 +1,10 @@
 /* @internal */
 namespace ts.codefix {
     const fixId = "fixCannotFindModule";
-    const errorCodes = [Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type.code];
+    const errorCodes = [
+        Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type.code,
+        Diagnostics.Did_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type.code
+    ];
     registerCodeFix({
         errorCodes,
         getCodeActions: context => {
@@ -31,7 +34,7 @@ namespace ts.codefix {
         return host.isKnownTypesPackageName(packageName) ? getTypesPackageName(packageName) : undefined;
     }
 
-    export function tryGetCodeActionForInstallPackageTypes(host: LanguageServiceHost, fileName: string, moduleName: string): CodeAction | undefined {
+    function tryGetCodeActionForInstallPackageTypes(host: LanguageServiceHost, fileName: string, moduleName: string): CodeAction | undefined {
         const packageName = getTypesPackageNameToInstall(host, moduleName);
         return packageName === undefined ? undefined : {
             description: formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Install_0), [packageName]),

src/services/refactors/installTypesForPackage.ts

@@ -1,5 +1,4 @@
 /// <reference path="annotateWithTypeFromJSDoc.ts" />
 /// <reference path="convertFunctionToEs6Class.ts" />
 /// <reference path="extractSymbol.ts" />
-/// <reference path="installTypesForPackage.ts" />
 /// <reference path="useDefaultImport.ts" />

src/services/refactors/refactors.ts

@@ -1422,7 +1422,7 @@ namespace ts {
 
         function getSuggestionDiagnostics(fileName: string): Diagnostic[] {
             synchronizeHostData();
-            return computeSuggestionDiagnostics(getValidSourceFile(fileName));
+            return computeSuggestionDiagnostics(getValidSourceFile(fileName), program);
         }
 
         function getCompilerOptionsDiagnostics() {

src/services/services.ts

@@ -1,8 +1,21 @@
 /* @internal */
 namespace ts {
-    export function computeSuggestionDiagnostics(sourceFile: SourceFile): Diagnostic[] {
-        return sourceFile.commonJsModuleIndicator
-            ? [createDiagnosticForNode(sourceFile.commonJsModuleIndicator, Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module)]
-            : emptyArray;
+    export function computeSuggestionDiagnostics(sourceFile: SourceFile, program: Program): Diagnostic[] {
+        const diags: Diagnostic[] = [];
+
+        if (sourceFile.commonJsModuleIndicator) {
+            diags.push(createDiagnosticForNode(sourceFile.commonJsModuleIndicator, Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module));
+        }
+
+        if (willAllowImplicitAnyJsModule(program.getCompilerOptions())) {
+            for (const importNode of sourceFile.imports) {
+                const resolved = getResolvedModule(sourceFile, importNode.text);
+                if (resolved && resolved.isExternalLibraryImport && !extensionIsTypeScript(resolved.extension)) {
+                    diags.push(createDiagnosticForModuleMissingTypes(importNode, resolved, importNode.text, Diagnostics.Did_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type));
+                }
+            }
+        }
+
+        return diags;
     }
 }

src/services/suggestionDiagnostics.ts

@@ -0,0 +1,29 @@
+/// <reference path='fourslash.ts' />
+
+// @moduleResolution: node
+
+// @Filename: /node_modules/abs/subModule.js
+////export const x = 0;
+
+// @Filename: /a.ts
+////import * as abs from [|"abs/subModule"|];
+
+test.setTypesRegistry({
+    "abs": undefined,
+});
+
+verify.noErrors();
+goTo.file("/a.ts");
+verify.getSuggestionDiagnostics([{
+    message: "Did not find a declaration file for module 'abs/subModule'. '/node_modules/abs/subModule.js' implicitly has an 'any' type.",
+    code: 80002,
+}]);
+
+verify.codeFixAvailable([{
+    description: "Install '@types/abs'",
+    commands: [{
+        type: "install package",
+        file: "/a.ts",
+        packageName: "@types/abs",
+    }],
+}]);