Merge pull request microsoft#27376 from Microsoft/codeFixCannotFindModule_suggestion_falsePositive

sheetalkamat · web-flow · commit 6bb1ff221495 · 2018-11-16T15:48:37.000-08:00
Don't implicit-any diagnostic for json module
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2270,7 +2270,7 @@ namespace ts {
             const sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);
             if (sourceFile) {
                 if (sourceFile.symbol) {
-                    if (resolvedModule.isExternalLibraryImport && !extensionIsTS(resolvedModule.extension)) {
+                    if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
                         errorOnImplicitAnyModule(/*isError*/ false, errorNode, resolvedModule, moduleReference);
                     }
                     // merged symbol is module declaration symbol combined with all augmentations
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -571,7 +571,8 @@ namespace FourSlash {
         public verifyNoErrors() {
             ts.forEachKey(this.inputFiles, fileName => {
                 if (!ts.isAnySupportedFileExtension(fileName)
-                    || !this.getProgram().getCompilerOptions().allowJs && !ts.extensionIsTS(ts.extensionFromPath(fileName))) return;
+                    || Harness.getConfigNameFromFileName(fileName)
+                    || !this.getProgram().getCompilerOptions().allowJs && !ts.resolutionExtensionIsTSOrJson(ts.extensionFromPath(fileName))) return;
                 const errors = this.getDiagnostics(fileName).filter(e => e.category !== ts.DiagnosticCategory.Suggestion);
                 if (errors.length) {
                     this.printErrorLog(/*expectErrors*/ false, errors);
diff --git a/tests/cases/fourslash/codeFixCannotFindModule_suggestion_falsePositive.ts b/tests/cases/fourslash/codeFixCannotFindModule_suggestion_falsePositive.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+// @moduleResolution: node
+// @resolveJsonModule: true
+// @strict: true
+
+// @Filename: /node_modules/foo/bar.json
+////{ "a": 0 }
+
+// @Filename: /a.ts
+////import abs = require([|"foo/bar.json"|]);
+////abs;
+
+verify.noErrors();
+goTo.file("/a.ts");
+verify.getSuggestionDiagnostics([]);

Original file line number	Diff line number	Diff line change
`@@ -2270,7 +2270,7 @@ namespace ts {`
`2270`	`2270`	`const sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);`
`2271`	`2271`	`if (sourceFile) {`
`2272`	`2272`	`if (sourceFile.symbol) {`
`2273`		`- if (resolvedModule.isExternalLibraryImport && !extensionIsTS(resolvedModule.extension)) {`
	`2273`	`+ if (resolvedModule.isExternalLibraryImport && !resolutionExtensionIsTSOrJson(resolvedModule.extension)) {`
`2274`	`2274`	`errorOnImplicitAnyModule(/isError/ false, errorNode, resolvedModule, moduleReference);`
`2275`	`2275`	`}`
`2276`	`2276`	`// merged symbol is module declaration symbol combined with all augmentations`