Optimize the deletion and calculation of bigger set of semantic diagnostics to be calculated

Author: sheetalkamat

src/compiler/builder.ts

@@ -38,6 +38,10 @@ namespace ts {
          * Already seen affected files
          */
         seenAffectedFiles: Map<true> | undefined;
+        /**
+         * True if the semantic diagnostics were copied from the old state
+         */
+        semanticDiagnosticsFromOldStateFiles?: number;
         /**
          * program corresponding to this state
          */
@@ -100,6 +104,7 @@ namespace ts {
                 const diagnostics = oldState!.semanticDiagnosticsPerFile!.get(sourceFilePath);
                 if (diagnostics) {
                     state.semanticDiagnosticsPerFile!.set(sourceFilePath, diagnostics);
+                    state.semanticDiagnosticsFromOldStateFiles = (state.semanticDiagnosticsFromOldStateFiles || 0) + 1;
                 }
             }
         });
@@ -124,19 +129,17 @@ namespace ts {
         while (true) {
             const { affectedFiles } = state;
             if (affectedFiles) {
-                const { seenAffectedFiles, semanticDiagnosticsPerFile } = state;
+                const seenAffectedFiles = state.seenAffectedFiles!;
                 let affectedFilesIndex = state.affectedFilesIndex!; // TODO: GH#18217
                 while (affectedFilesIndex < affectedFiles.length) {
                     const affectedFile = affectedFiles[affectedFilesIndex];
-                    if (!seenAffectedFiles!.has(affectedFile.path)) {
+                    if (!seenAffectedFiles.has(affectedFile.path)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        semanticDiagnosticsPerFile!.delete(affectedFile.path);
-                        // Remove semantic diagnostics for files that are affected by using exports of this module
-                        BuilderState.getFilesAffectedByExportedModule(state, affectedFile.path, state.currentAffectedFilesExportedModulesMap).forEach(path => semanticDiagnosticsPerFile!.delete(path));
+                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
                         return affectedFile;
                     }
-                    seenAffectedFiles!.set(affectedFile.path, true);
+                    seenAffectedFiles.set(affectedFile.path, true);
                     affectedFilesIndex++;
                 }
 
@@ -172,12 +175,74 @@ namespace ts {
             }
             state.affectedFiles = BuilderState.getFilesAffectedBy(state, state.program, nextKey.value as Path, cancellationToken, computeHash, state.currentAffectedFilesSignatures, state.currentAffectedFilesExportedModulesMap);
             state.currentChangedFilePath = nextKey.value as Path;
-            state.semanticDiagnosticsPerFile!.delete(nextKey.value as Path);
             state.affectedFilesIndex = 0;
             state.seenAffectedFiles = state.seenAffectedFiles || createMap<true>();
         }
     }
 
+    /**
+     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     */
+    function cleanSemanticDiagnosticsOfAffectedFile(state: BuilderProgramState, affectedFile: SourceFile) {
+        if (!state.semanticDiagnosticsFromOldStateFiles) {
+            Debug.assert(!state.semanticDiagnosticsPerFile!.has(affectedFile.path));
+            return;
+        }
+
+        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
+            // If there are no more diagnostics from old cache, remove them
+            return;
+        }
+
+        // If there was change in signature for the changed file,
+        // then delete the semantic diagnostics for files that are affected by using exports of this module
+
+        if (!state.exportedModulesMap || state.affectedFiles!.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+
+        Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (forEachEntry(state.currentAffectedFilesExportedModulesMap!, (exportedModules, exportedFromPath) =>
+            exportedModules &&
+            exportedModules.has(affectedFile.path) &&
+            removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath as Path)
+        )) {
+            return;
+        }
+
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        forEachEntry(state.exportedModulesMap, (exportedModules, exportedFromPath) =>
+            !state.currentAffectedFilesExportedModulesMap!.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+            exportedModules.has(affectedFile.path) &&
+            removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath as Path)
+        );
+    }
+
+    /**
+     * removes the semantic diagnostics of files referencing referencedPath and
+     * returns true if there are no more semantic diagnostics from old state
+     */
+    function removeSemanticDiagnosticsOfFilesReferencingPath(state: BuilderProgramState, referencedPath: Path) {
+        return forEachEntry(state.referencedMap!, (referencesInFile, filePath) =>
+            referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOf(state, filePath as Path)
+        );
+    }
+
+    /**
+     * Removes semantic diagnostics for path and
+     * returns true if there are no more semantic diagnostics from the old state
+     */
+    function removeSemanticDiagnosticsOf(state: BuilderProgramState, path: Path) {
+        if (state.semanticDiagnosticsPerFile!.delete(path)) {
+            Debug.assert((state.semanticDiagnosticsFromOldStateFiles || 0) > 0);
+            state.semanticDiagnosticsFromOldStateFiles!--;
+            return !state.semanticDiagnosticsFromOldStateFiles;
+        }
+        return false;
+    }
+
     /**
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly

src/compiler/builderState.ts

@@ -320,44 +320,6 @@ namespace ts.BuilderState {
         }
     }
 
-    /**
-     * Gets the files affected by exported module
-     */
-    export function getFilesAffectedByExportedModule(state: BuilderState, path: Path, exportedModulesMapCache?: ComputingExportedModulesMap): ReadonlyArray<Path> {
-        if (!state.exportedModulesMap) {
-            return emptyArray;
-        }
-
-        Debug.assert(!!exportedModulesMapCache);
-        let affectedFiles: Map<true> | undefined;
-        // Go through exported modules from cache first
-        exportedModulesMapCache!.forEach((exportedModules, exportedFromPath) => {
-            // If exported modules has path, all files referencing file exported from are affected
-            if (exportedModules && exportedModules.has(path)) {
-                addFilesReferencing(exportedFromPath as Path);
-            }
-        });
-        state.exportedModulesMap.forEach((exportedModules, exportedFromPath) => {
-            // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-            if (!exportedModulesMapCache!.has(exportedFromPath) && exportedModules.has(path)) {
-                addFilesReferencing(exportedFromPath as Path);
-            }
-        });
-
-        return affectedFiles ? arrayFrom(affectedFiles.keys()) as Path[] : emptyArray;
-
-        function addFilesReferencing(referencingFilePath: Path) {
-            state.referencedMap!.forEach((referencesInFile, filePath) => {
-                if (referencesInFile.has(referencingFilePath)) {
-                    if (!affectedFiles) {
-                        affectedFiles = createMap<true>();
-                    }
-                    affectedFiles.set(filePath, true);
-                }
-            });
-        }
-    }
-
     /**
      * Get all the dependencies of the sourceFile
      */