Have checker collect a list of suggestion diagnostics instead of redoing work in calculateSuggestionDiagnostics

Author: Andy Hanson

src/compiler/checker.ts

@@ -311,6 +311,8 @@ namespace ts {
                 node = getParseTreeNode(node, isTypeNode);
                 return node && getTypeArgumentConstraint(node);
             },
+
+            getSuggestionDiagnostics: file => suggestionDiagnostics.get(file.fileName) || emptyArray,
         };
 
         const tupleTypes: GenericType[] = [];
@@ -449,6 +451,19 @@ namespace ts {
         const awaitedTypeStack: number[] = [];
 
         const diagnostics = createDiagnosticCollection();
+        // Suggestion diagnostics must have a file. Keyed by source file name.
+        const suggestionDiagnostics = createMultiMap<Diagnostic>();
+        function addSuggestionDiagnostic(diag: Diagnostic): void {
+            suggestionDiagnostics.add(diag.file.fileName, { ...diag, category: DiagnosticCategory.Suggestion });
+        }
+        function addErrorOrSuggestionDiagnostic(isError: boolean, diag: Diagnostic) {
+            if (isError) {
+                diagnostics.add(diag);
+            }
+            else {
+                addSuggestionDiagnostic(diag);
+            }
+        }
 
         const enum TypeFacts {
             None = 0,
@@ -2095,9 +2110,15 @@ namespace ts {
                     const diag = Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
                     error(errorNode, diag, moduleReference, resolvedModule.resolvedFileName);
                 }
-                else if (noImplicitAny && moduleNotFoundError) {
-                    diagnostics.add(createDiagnosticForModuleMissingTypes(errorNode, resolvedModule, moduleReference, Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type));
-                }
+                const 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));
+                addErrorOrSuggestionDiagnostic(noImplicitAny && !!moduleNotFoundError, createDiagnosticForNodeFromMessageChain(errorNode, chainDiagnosticMessages(
+                    errorInfo,
+                    Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type,
+                    moduleReference,
+                    resolvedModule.resolvedFileName)));
                 // 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,10 +3818,6 @@
         "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,26 +2416,10 @@ namespace ts {
             return options.jsx ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
         }
         function needAllowJs() {
-            return willAllowImplicitAnyJsModule(options) ? undefined : Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;
+            return options.allowJs || !getStrictOptionValue(options, "noImplicitAny") ? 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/compiler/types.ts

@@ -2954,6 +2954,8 @@ namespace ts {
         /** @param node A location where we might consider accessing `this`. Not necessarily a ThisExpression. */
         /* @internal */ tryGetThisTypeAt(node: Node): Type | undefined;
         /* @internal */ getTypeArgumentConstraint(node: TypeNode): Type | undefined;
+
+        /* @internal */ getSuggestionDiagnostics(file: SourceFile): ReadonlyArray<Diagnostic>;
     }
 
     /* @internal */

src/services/codefixes/fixCannotFindModule.ts

@@ -1,10 +1,7 @@
 /* @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,
-        Diagnostics.Did_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];
     registerCodeFix({
         errorCodes,
         getCodeActions: context => {

src/services/suggestionDiagnostics.ts

@@ -1,21 +1,14 @@
 /* @internal */
 namespace ts {
     export function computeSuggestionDiagnostics(sourceFile: SourceFile, program: Program): Diagnostic[] {
+        program.getSemanticDiagnostics(sourceFile); //todo: assert that this was already done
+        const checker = program.getDiagnosticsProducingTypeChecker();
         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;
+        return diags.concat(checker.getSuggestionDiagnostics(sourceFile));
     }
 }

tests/cases/fourslash/codeFixCannotFindModule_suggestion.ts

@@ -15,8 +15,8 @@ test.setTypesRegistry({
 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,
+    message: "Could not find a declaration file for module 'abs/subModule'. '/node_modules/abs/subModule.js' implicitly has an 'any' type.",
+    code: 7016,
 }]);
 
 verify.codeFixAvailable([{