Handle reusing type reference resolution in resolution cache correctly (microsoft#51475)

sheetalkamat · web-flow · commit 3eafb64faf44 · 2022-11-10T16:03:25.000-08:00
* Add tests where typeRef resolution is not in the cache

* Ensure that type ref reuse is actually handled since type ref resolution only sends containingSourceFileMode and not containingSourceFile
diff --git a/src/compiler/resolutionCache.ts b/src/compiler/resolutionCache.ts
@@ -581,12 +581,13 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
             resolvedModules.push(getResolutionWithResolvedFileName(resolution));
         }
 
-        if (containingSourceFile && resolutionInfo) {
+        // If resolving type reference directive we dont need containingSourceFile to determine if we can use resolutionInfo
+        if (resolutionInfo && (loader === resolveTypeReferenceDirective as unknown || containingSourceFile)) {
             resolutionInfo.reusedNames?.forEach(entry => seenNamesInFile.set(
                 getResolutionName(entry),
                 !isString(entry) && isStringLiteralLike(entry) ?
-                    getModeForUsageLocation(containingSourceFile, entry) :
-                    getModeForFileReference(entry, containingSourceFile.impliedNodeFormat),
+                    getModeForUsageLocation(containingSourceFile!, entry) :
+                    getModeForFileReference(entry, containingSourceFileMode),
                 true,
             ));
             reusedNames = undefined;
diff --git a/src/testRunner/unittests/tscWatch/resolutionCache.ts b/src/testRunner/unittests/tscWatch/resolutionCache.ts
@@ -1,4 +1,5 @@
 import * as ts from "../../_namespaces/ts";
+import * as Utils from "../../_namespaces/Utils";
 import { createWatchedSystem, File, libFile, SymLink } from "../virtualFileSystemWithWatch";
 import { createBaseline, createWatchCompilerHostOfFilesAndCompilerOptionsForBaseline, runWatchBaseline, verifyTscWatch } from "./helpers";
 
@@ -565,4 +566,50 @@ declare namespace NodeJS {
             ]
         });
     });
+
+    verifyTscWatch({
+        scenario,
+        subScenario: "reusing type ref resolution",
+        sys: () => createWatchedSystem({
+            "/src/project/tsconfig.json": JSON.stringify({
+                compilerOptions: {
+                    composite: true,
+                    traceResolution: true,
+                    outDir: "outDir",
+                },
+            }),
+            "/src/project/fileWithImports.ts": Utils.dedent`
+                import type { Import0 } from "pkg0";
+                import type { Import1 } from "pkg1";
+            `,
+            "/src/project/node_modules/pkg0/index.d.ts": `export interface Import0 {}`,
+            "/src/project/fileWithTypeRefs.ts": Utils.dedent`
+                /// <reference types="pkg2"/>
+                /// <reference types="pkg3"/>
+                interface LocalInterface extends Import2, Import3 {}
+                export {}
+            `,
+            "/src/project/node_modules/pkg2/index.d.ts": `interface Import2 {}`,
+            [libFile.path]: libFile.content,
+        }, { currentDirectory: "/src/project" }),
+        commandLineArgs: ["-w", "--explainFiles", "--extendedDiagnostics"],
+        changes: [
+            {
+                caption: "write file not resolved by import",
+                change: sys => sys.ensureFileOrFolder({ path: "/src/project/node_modules/pkg1/index.d.ts", content: `export interface Import1 {}` }),
+                timeouts: sys => {
+                    sys.runQueuedTimeoutCallbacks(); // failed lookup
+                    sys.runQueuedTimeoutCallbacks(); // actual update
+                }
+            },
+            {
+                caption: "write file not resolved by typeRef",
+                change: sys => sys.ensureFileOrFolder({ path: "/src/project/node_modules/pkg3/index.d.ts", content: `export interface Import3 {}` }),
+                timeouts: sys => {
+                    sys.runQueuedTimeoutCallbacks(); // failed lookup
+                    sys.runQueuedTimeoutCallbacks(); // actual update
+                }
+            },
+        ]
+    });
 });
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js b/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js
