improve error message TS2307

Author: donaldpipowitch

src/compiler/checker.ts

@@ -2247,7 +2247,7 @@ namespace ts {
         }
 
         function resolveExternalModuleName(location: Node, moduleReferenceExpression: Expression): Symbol | undefined {
-            return resolveExternalModuleNameWorker(location, moduleReferenceExpression, Diagnostics.Cannot_find_module_0);
+            return resolveExternalModuleNameWorker(location, moduleReferenceExpression, Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations);
         }
 
         function resolveExternalModuleNameWorker(location: Node, moduleReferenceExpression: Expression, moduleNotFoundError: DiagnosticMessage | undefined, isForAugmentation = false): Symbol | undefined {

src/compiler/diagnosticMessages.json

@@ -1044,7 +1044,7 @@
         "category": "Error",
         "code": 2306
     },
-    "Cannot find module '{0}'.": {
+    "Cannot find module '{0}' or its corresponding type declarations.": {
         "category": "Error",
         "code": 2307
     },

src/services/codefixes/fixCannotFindModule.ts

@@ -4,7 +4,7 @@ namespace ts.codefix {
     const fixIdInstallTypesPackage = "installTypesPackage";
     const fixIdGenerateTypes = "generateTypes";
 
-    const errorCodeCannotFindModule = Diagnostics.Cannot_find_module_0.code;
+    const errorCodeCannotFindModule = Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations.code;
     const errorCodes = [
         errorCodeCannotFindModule,
         Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type.code,

src/testRunner/unittests/tsbuild.ts

@@ -451,7 +451,7 @@ export const b = new A();`);
                 ];
                 verifyBuild(fs => modifyFsBTsToNonRelativeImport(fs, "node"),
                     allExpectedOutputs,
-                    [Diagnostics.Cannot_find_module_0],
+                    [Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations],
                     expectedFileTraces);
             });
         });

src/testRunner/unittests/tscWatchMode.ts

@@ -232,7 +232,7 @@ namespace ts.tscWatch {
 
     function getDiagnosticModuleNotFoundOfFile(program: Program, file: File, moduleName: string) {
         const quotedModuleName = `"${moduleName}"`;
-        return getDiagnosticOfFileFromProgram(program, file.path, file.content.indexOf(quotedModuleName), quotedModuleName.length, Diagnostics.Cannot_find_module_0, moduleName);
+        return getDiagnosticOfFileFromProgram(program, file.path, file.content.indexOf(quotedModuleName), quotedModuleName.length, Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations, moduleName);
     }
 
     describe("tsc-watch program updates", () => {

src/testRunner/unittests/tsserverProjectSystem.ts

@@ -4792,7 +4792,7 @@ var x = 10;`
             host.runQueuedTimeoutCallbacks();
             diags = session.executeCommand(getErrRequest).response as server.protocol.Diagnostic[];
             verifyDiagnostics(diags, [
-                { diagnosticMessage: Diagnostics.Cannot_find_module_0, errorTextArguments: ["./moduleFile"] }
+                { diagnosticMessage: Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations, errorTextArguments: ["./moduleFile"] }
             ]);
             assert.equal(diags.length, 1);
 
@@ -4843,7 +4843,7 @@ var x = 10;`
             host.runQueuedTimeoutCallbacks();
             diags = session.executeCommand(getErrRequest).response as server.protocol.Diagnostic[];
             verifyDiagnostics(diags, [
-                { diagnosticMessage: Diagnostics.Cannot_find_module_0, errorTextArguments: ["./moduleFile"] }
+                { diagnosticMessage: Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations, errorTextArguments: ["./moduleFile"] }
             ]);
 
             moduleFile.path = moduleFileOldPath;
@@ -4918,7 +4918,7 @@ var x = 10;`
             );
             let diags = session.executeCommand(getErrRequest).response as server.protocol.Diagnostic[];
             verifyDiagnostics(diags, [
-                { diagnosticMessage: Diagnostics.Cannot_find_module_0, errorTextArguments: ["./moduleFile"] }
+                { diagnosticMessage: Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations, errorTextArguments: ["./moduleFile"] }
             ]);
 
             host.reloadFS([file1, moduleFile]);
@@ -4975,7 +4975,7 @@ var x = 10;`
             checkErrorMessage(session, "semanticDiag", {
                 file: file1.path,
                 diagnostics: [
-                    createDiagnostic({ line: 1, offset: startOffset }, { line: 1, offset: startOffset + '"pad"'.length }, Diagnostics.Cannot_find_module_0, ["pad"])
+                    createDiagnostic({ line: 1, offset: startOffset }, { line: 1, offset: startOffset + '"pad"'.length }, Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations, ["pad"])
                 ],
             });
             session.clearMessages();
@@ -7152,8 +7152,8 @@ var x = 10;`
             let diags = project.getLanguageService().getSemanticDiagnostics(root.path);
             assert.equal(diags.length, 1);
             const diag = diags[0];
-            assert.equal(diag.code, Diagnostics.Cannot_find_module_0.code);
-            assert.equal(flattenDiagnosticMessageText(diag.messageText, "\n"), "Cannot find module 'bar'.");
+            assert.equal(diag.code, Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations.code);
+            assert.equal(flattenDiagnosticMessageText(diag.messageText, "\n"), "Cannot find module 'bar' or its corresponding type declarations.");
             callsTrackingHost.verifyCalledOn(CalledMapsWithSingleArg.fileExists, imported.path);
 
 
@@ -7386,8 +7386,8 @@ var x = 10;`
 
                 const project = service.configuredProjects.get(tsconfig.path)!;
                 checkProjectActualFiles(project, files.map(f => f.path));
-                assert.deepEqual(project.getLanguageService().getSemanticDiagnostics(file1.path).map(diag => diag.messageText), ["Cannot find module 'debug'."]);
-                assert.deepEqual(project.getLanguageService().getSemanticDiagnostics(file2.path).map(diag => diag.messageText), ["Cannot find module 'debug'."]);
+                assert.deepEqual(project.getLanguageService().getSemanticDiagnostics(file1.path).map(diag => diag.messageText), ["Cannot find module 'debug' or its corresponding type declarations."]);
+                assert.deepEqual(project.getLanguageService().getSemanticDiagnostics(file2.path).map(diag => diag.messageText), ["Cannot find module 'debug' or its corresponding type declarations."]);
 
                 const debugTypesFile: File = {
                     path: `${projectLocation}/node_modules/debug/index.d.ts`,
@@ -7594,7 +7594,7 @@ var x = 10;`
 
             const project = service.configuredProjects.get(tsconfig.path)!;
             checkProjectActualFiles(project, files.map(f => f.path));
-            assert.deepEqual(project.getLanguageService().getSemanticDiagnostics(app.path).map(diag => diag.messageText), ["Cannot find module 'debug'."]);
+            assert.deepEqual(project.getLanguageService().getSemanticDiagnostics(app.path).map(diag => diag.messageText), ["Cannot find module 'debug' or its corresponding type declarations."]);
 
             const debugTypesFile: File = {
                 path: `${projectLocation}/node_modules/@types/debug/index.d.ts`,
@@ -8552,7 +8552,7 @@ new C();`
                         verifyWatchedFilesAndDirectories(session.host, filesInProjectWithUnresolvedModule, watchedDirectoriesWithUnresolvedModule, nonRecursiveWatchedDirectories);
                         const startOffset = recognizersDateTimeSrcFile.content.indexOf('"') + 1;
                         verifyErrors(session, [
-                            createDiagnostic({ line: 1, offset: startOffset }, { line: 1, offset: startOffset + moduleNameInFile.length }, Diagnostics.Cannot_find_module_0, [moduleName])
+                            createDiagnostic({ line: 1, offset: startOffset }, { line: 1, offset: startOffset + moduleNameInFile.length }, Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations, [moduleName])
                         ]);
                     }
 

tests/baselines/reference/aliasesInSystemModule1.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/compiler/aliasesInSystemModule1.ts(1,24): error TS2307: Cannot find module 'foo'.
+tests/cases/compiler/aliasesInSystemModule1.ts(1,24): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/aliasesInSystemModule1.ts (1 errors) ====
     import alias = require('foo');
                            ~~~~~
-!!! error TS2307: Cannot find module 'foo'.
+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
     import cls = alias.Class;
     export import cls2 = alias.Class;
 

tests/baselines/reference/aliasesInSystemModule2.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/compiler/aliasesInSystemModule2.ts(1,21): error TS2307: Cannot find module 'foo'.
+tests/cases/compiler/aliasesInSystemModule2.ts(1,21): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/aliasesInSystemModule2.ts (1 errors) ====
     import {alias} from "foo";
                         ~~~~~
-!!! error TS2307: Cannot find module 'foo'.
+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
     import cls = alias.Class;
     export import cls2 = alias.Class;
 

tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt

@@ -1,5 +1,5 @@
 tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(4,16): error TS2664: Invalid module name in augmentation, module 'ext' cannot be found.
-tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(9,22): error TS2307: Cannot find module 'ext'.
+tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(9,22): error TS2307: Cannot find module 'ext' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts (2 errors) ====
@@ -15,5 +15,5 @@ tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts(9,22): erro
     // Cannot resolve this ext module reference
     import ext = require("ext");
                          ~~~~~
-!!! error TS2307: Cannot find module 'ext'.
+!!! error TS2307: Cannot find module 'ext' or its corresponding type declarations.
     var x = ext;

tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.errors.txt

@@ -1,5 +1,5 @@
 tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts(2,5): error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name.
-tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts(2,25): error TS2307: Cannot find module './SubModule'.
+tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts(2,25): error TS2307: Cannot find module './SubModule' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts (2 errors) ====
@@ -8,7 +8,7 @@ tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2439: Import or export declaration in an ambient module declaration cannot reference module through relative module name.
                             ~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module './SubModule'.
+!!! error TS2307: Cannot find module './SubModule' or its corresponding type declarations.
         class SubModule {
             public static StaticVar: number;
             public InstanceVar: number;

tests/baselines/reference/amdDependencyComment1.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/compiler/amdDependencyComment1.ts(3,21): error TS2307: Cannot find module 'm2'.
+tests/cases/compiler/amdDependencyComment1.ts(3,21): error TS2307: Cannot find module 'm2' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/amdDependencyComment1.ts (1 errors) ====
     ///<amd-dependency path='bar'/>
 
     import m1 = require("m2")
                         ~~~~
-!!! error TS2307: Cannot find module 'm2'.
+!!! error TS2307: Cannot find module 'm2' or its corresponding type declarations.
     m1.f();

tests/baselines/reference/amdDependencyComment2.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/compiler/amdDependencyComment2.ts(3,21): error TS2307: Cannot find module 'm2'.
+tests/cases/compiler/amdDependencyComment2.ts(3,21): error TS2307: Cannot find module 'm2' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/amdDependencyComment2.ts (1 errors) ====
     ///<amd-dependency path='bar'/>
 
     import m1 = require("m2")
                         ~~~~
-!!! error TS2307: Cannot find module 'm2'.
+!!! error TS2307: Cannot find module 'm2' or its corresponding type declarations.
     m1.f();

tests/baselines/reference/amdDependencyCommentName1.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find module 'm2'.
+tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find module 'm2' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/amdDependencyCommentName1.ts (1 errors) ====
     ///<amd-dependency path='bar' name='b'/>
 
     import m1 = require("m2")
                         ~~~~
-!!! error TS2307: Cannot find module 'm2'.
+!!! error TS2307: Cannot find module 'm2' or its corresponding type declarations.
     m1.f();

tests/baselines/reference/amdDependencyCommentName2.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find module 'm2'.
+tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find module 'm2' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/amdDependencyCommentName2.ts (1 errors) ====
     ///<amd-dependency path='bar' name='b'/>
 
     import m1 = require("m2")
                         ~~~~
-!!! error TS2307: Cannot find module 'm2'.
+!!! error TS2307: Cannot find module 'm2' or its corresponding type declarations.
     m1.f();

tests/baselines/reference/amdDependencyCommentName3.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot find module 'm2'.
+tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot find module 'm2' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/amdDependencyCommentName3.ts (1 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot fi
 
     import m1 = require("m2")
                         ~~~~
-!!! error TS2307: Cannot find module 'm2'.
+!!! error TS2307: Cannot find module 'm2' or its corresponding type declarations.
     m1.f();

tests/baselines/reference/amdDependencyCommentName4.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/compiler/amdDependencyCommentName4.ts(8,21): error TS2307: Cannot find module 'aliasedModule1'.
-tests/cases/compiler/amdDependencyCommentName4.ts(11,26): error TS2307: Cannot find module 'aliasedModule2'.
-tests/cases/compiler/amdDependencyCommentName4.ts(14,15): error TS2307: Cannot find module 'aliasedModule3'.
-tests/cases/compiler/amdDependencyCommentName4.ts(17,21): error TS2307: Cannot find module 'aliasedModule4'.
+tests/cases/compiler/amdDependencyCommentName4.ts(8,21): error TS2307: Cannot find module 'aliasedModule1' or its corresponding type declarations.
+tests/cases/compiler/amdDependencyCommentName4.ts(11,26): error TS2307: Cannot find module 'aliasedModule2' or its corresponding type declarations.
+tests/cases/compiler/amdDependencyCommentName4.ts(14,15): error TS2307: Cannot find module 'aliasedModule3' or its corresponding type declarations.
+tests/cases/compiler/amdDependencyCommentName4.ts(17,21): error TS2307: Cannot find module 'aliasedModule4' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/amdDependencyCommentName4.ts (4 errors) ====
@@ -14,22 +14,22 @@ tests/cases/compiler/amdDependencyCommentName4.ts(17,21): error TS2307: Cannot f
 
     import r1 = require("aliasedModule1");
                         ~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'aliasedModule1'.
+!!! error TS2307: Cannot find module 'aliasedModule1' or its corresponding type declarations.
     r1;
 
     import {p1, p2, p3} from "aliasedModule2";
                              ~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'aliasedModule2'.
+!!! error TS2307: Cannot find module 'aliasedModule2' or its corresponding type declarations.
     p1;
 
     import d from "aliasedModule3";
                   ~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'aliasedModule3'.
+!!! error TS2307: Cannot find module 'aliasedModule3' or its corresponding type declarations.
     d;
 
     import * as ns from "aliasedModule4";
                         ~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'aliasedModule4'.
+!!! error TS2307: Cannot find module 'aliasedModule4' or its corresponding type declarations.
     ns;
 
     import "unaliasedModule2";

tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/async/es2017/asyncAwaitIsolatedModules_es2017.ts(1,27): error TS2307: Cannot find module 'missing'.
+tests/cases/conformance/async/es2017/asyncAwaitIsolatedModules_es2017.ts(1,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
 
 ==== tests/cases/conformance/async/es2017/asyncAwaitIsolatedModules_es2017.ts (1 errors) ====
     import { MyPromise } from "missing";
                               ~~~~~~~~~
-!!! error TS2307: Cannot find module 'missing'.
+!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
     declare var p: Promise<number>;
     declare var mp: MyPromise<number>;

tests/baselines/reference/asyncAwaitIsolatedModules_es5.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts(1,27): error TS2307: Cannot find module 'missing'.
+tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts(1,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
 
 ==== tests/cases/conformance/async/es5/asyncAwaitIsolatedModules_es5.ts (1 errors) ====
     import { MyPromise } from "missing";
                               ~~~~~~~~~
-!!! error TS2307: Cannot find module 'missing'.
+!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
     declare var p: Promise<number>;
     declare var mp: MyPromise<number>;

tests/baselines/reference/asyncAwaitIsolatedModules_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts(1,27): error TS2307: Cannot find module 'missing'.
+tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts(1,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
 
 ==== tests/cases/conformance/async/es6/asyncAwaitIsolatedModules_es6.ts (1 errors) ====
     import { MyPromise } from "missing";
                               ~~~~~~~~~
-!!! error TS2307: Cannot find module 'missing'.
+!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
     declare var p: Promise<number>;
     declare var mp: MyPromise<number>;

tests/baselines/reference/badExternalModuleReference.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/compiler/badExternalModuleReference.ts(1,21): error TS2307: Cannot find module 'garbage'.
+tests/cases/compiler/badExternalModuleReference.ts(1,21): error TS2307: Cannot find module 'garbage' or its corresponding type declarations.
 
 
 ==== tests/cases/compiler/badExternalModuleReference.ts (1 errors) ====
     import a1 = require("garbage");
                         ~~~~~~~~~
-!!! error TS2307: Cannot find module 'garbage'.
+!!! error TS2307: Cannot find module 'garbage' or its corresponding type declarations.
     export declare var a: {
         test1: a1.connectModule;
         (): a1.connectExport;