Clear ExportMapCache on cancellation requested

microsoft · May 5, 2022 · b999eab · b999eab
1 parent c8ec855
commit b999eab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/services/exportInfoMap.ts b/src/services/exportInfoMap.ts
@@ -382,7 +382,12 @@ namespace ts {
         const compilerOptions = program.getCompilerOptions();
         let moduleCount = 0;
         forEachExternalModuleToImportFrom(program, host, /*useAutoImportProvider*/ true, (moduleSymbol, moduleFile, program, isFromPackageJson) => {
-            if (++moduleCount % 100 === 0) cancellationToken?.throwIfCancellationRequested();
+            if (++moduleCount % 100 === 0) {
+                cancellationToken?.throwIfCancellationRequested(() => {
+                    cache.clear();
+                });
+            }
+
             const seenExports = new Map<__String, true>();
             const checker = program.getTypeChecker();
             const defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);

diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1201,8 +1201,9 @@ namespace ts {
             return this.cancellationToken.isCancellationRequested();
         }
 
-        public throwIfCancellationRequested(): void {
+        public throwIfCancellationRequested(cleanup?: () => void): void {
             if (this.isCancellationRequested()) {
+                cleanup?.();
                 tracing?.instant(tracing.Phase.Session, "cancellationThrown", { kind: "CancellationTokenObject" });
                 throw new OperationCanceledException();
             }
@@ -1232,8 +1233,9 @@ namespace ts {
             return false;
         }
 
-        public throwIfCancellationRequested(): void {
+        public throwIfCancellationRequested(cleanup?: () => void): void {
             if (this.isCancellationRequested()) {
+                cleanup?.();
                 tracing?.instant(tracing.Phase.Session, "cancellationThrown", { kind: "ThrottledCancellationToken" });
                 throw new OperationCanceledException();
             }

diff --git a/src/services/types.ts b/src/services/types.ts
@@ -182,6 +182,10 @@ namespace ts {
         isCancellationRequested(): boolean;
     }
 
+    export interface CancellationToken {
+        throwIfCancellationRequested(cleanup?: () => void): void;
+    }
+
     export interface InstallPackageOptions {
         fileName: Path;
         packageName: string;