Force new typings resolution only if there are more or less script infos in the project.

sheetalkamat · sheetalkamat · commit 35abe2682422 · 2018-04-13T15:17:13.000-07:00
This helps in reducing number of forced typing installation requests
We anyways use changes in unresolved import array to determine if we need to enqueue new typing request
Hence there is no need to soley rely on hasChanges from updateGraph which just indicates that we didnt reused the program (that does not mean new files were added to the program or changes in unresolved imports)
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -2987,18 +2987,19 @@ namespace ts {
     }
 
     /** Remove the *first* occurrence of `item` from the array. */
-    export function unorderedRemoveItem<T>(array: T[], item: T): void {
+    export function unorderedRemoveItem<T>(array: T[], item: T) {
         unorderedRemoveFirstItemWhere(array, element => element === item);
     }
 
     /** Remove the *first* element satisfying `predicate`. */
-    function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {
+    function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean) {
         for (let i = 0; i < array.length; i++) {
             if (predicate(array[i])) {
                 unorderedRemoveItemAt(array, i);
-                break;
+                return true;
             }
         }
+        return false;
     }
 
     export type GetCanonicalFileName = (fileName: string) => string;
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -92,6 +92,8 @@ namespace ts.server {
         cachedUnresolvedImportsPerFile = createMap<ReadonlyArray<string>>();
         /*@internal*/
         lastCachedUnresolvedImportsList: SortedReadonlyArray<string>;
+        /*@internal*/
+        hasMoreOrLessScriptInfos = false;
 
         private lastFileExceededProgramSize: string | undefined;
 
@@ -777,6 +779,8 @@ namespace ts.server {
             this.resolutionCache.startRecordingFilesWithChangedResolutions();
 
             let hasChanges = this.updateGraphWorker();
+            const hasMoreOrLessScriptInfos = this.hasMoreOrLessScriptInfos;
+            this.hasMoreOrLessScriptInfos = false;
 
             const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
 
@@ -803,7 +807,7 @@ namespace ts.server {
                     this.lastCachedUnresolvedImportsList = toDeduplicatedSortedArray(result);
                 }
 
-                const cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasChanges);
+                const cachedTypings = this.projectService.typingsCache.getTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasMoreOrLessScriptInfos);
                 if (!arrayIsEqualTo(this.typingFiles, cachedTypings)) {
                     this.typingFiles = cachedTypings;
                     this.markAsDirty();
diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
@@ -304,6 +304,7 @@ namespace ts.server {
             const isNew = !this.isAttached(project);
             if (isNew) {
                 this.containingProjects.push(project);
+                project.hasMoreOrLessScriptInfos = true;
                 if (!project.getCompilerOptions().preserveSymlinks) {
                     this.ensureRealPath();
                 }
@@ -328,19 +329,24 @@ namespace ts.server {
                     return;
                 case 1:
                     if (this.containingProjects[0] === project) {
+                        project.hasMoreOrLessScriptInfos = true;
                         this.containingProjects.pop();
                     }
                     break;
                 case 2:
                     if (this.containingProjects[0] === project) {
+                        project.hasMoreOrLessScriptInfos = true;
                         this.containingProjects[0] = this.containingProjects.pop();
                     }
                     else if (this.containingProjects[1] === project) {
+                        project.hasMoreOrLessScriptInfos = true;
                         this.containingProjects.pop();
                     }
                     break;
                 default:
-                    unorderedRemoveItem(this.containingProjects, project);
+                    if (unorderedRemoveItem(this.containingProjects, project)) {
+                        project.hasMoreOrLessScriptInfos = true;
+                    }
                     break;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2987,18 +2987,19 @@ namespace ts {`
`2987`	`2987`	`}`
`2988`	`2988`
`2989`	`2989`	/** Remove the first occurrence of `item` from the array. */
`2990`		`- export function unorderedRemoveItem<T>(array: T[], item: T): void {`
	`2990`	`+ export function unorderedRemoveItem<T>(array: T[], item: T) {`
`2991`	`2991`	`unorderedRemoveFirstItemWhere(array, element => element === item);`
`2992`	`2992`	`}`
`2993`	`2993`
`2994`	`2994`	/** Remove the first element satisfying `predicate`. */
`2995`		`- function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {`
	`2995`	`+ function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean) {`
`2996`	`2996`	`for (let i = 0; i < array.length; i++) {`
`2997`	`2997`	`if (predicate(array[i])) {`
`2998`	`2998`	`unorderedRemoveItemAt(array, i);`
`2999`		`- break;`
	`2999`	`+ return true;`
`3000`	`3000`	`}`
`3001`	`3001`	`}`
	`3002`	`+ return false;`
`3002`	`3003`	`}`
`3003`	`3004`
`3004`	`3005`	`export type GetCanonicalFileName = (fileName: string) => string;`
Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,7 @@ namespace ts.server {`
`304`	`304`	`const isNew = !this.isAttached(project);`
`305`	`305`	`if (isNew) {`
`306`	`306`	`this.containingProjects.push(project);`
	`307`	`+ project.hasMoreOrLessScriptInfos = true;`
`307`	`308`	`if (!project.getCompilerOptions().preserveSymlinks) {`
`308`	`309`	`this.ensureRealPath();`
`309`	`310`	`}`
`@@ -328,19 +329,24 @@ namespace ts.server {`
`328`	`329`	`return;`
`329`	`330`	`case 1:`
`330`	`331`	`if (this.containingProjects[0] === project) {`
	`332`	`+ project.hasMoreOrLessScriptInfos = true;`
`331`	`333`	`this.containingProjects.pop();`
`332`	`334`	`}`
`333`	`335`	`break;`
`334`	`336`	`case 2:`
`335`	`337`	`if (this.containingProjects[0] === project) {`
	`338`	`+ project.hasMoreOrLessScriptInfos = true;`
`336`	`339`	`this.containingProjects[0] = this.containingProjects.pop();`
`337`	`340`	`}`
`338`	`341`	`else if (this.containingProjects[1] === project) {`
	`342`	`+ project.hasMoreOrLessScriptInfos = true;`
`339`	`343`	`this.containingProjects.pop();`
`340`	`344`	`}`
`341`	`345`	`break;`
`342`	`346`	`default:`
`343`		`- unorderedRemoveItem(this.containingProjects, project);`
	`347`	`+ if (unorderedRemoveItem(this.containingProjects, project)) {`
	`348`	`+ project.hasMoreOrLessScriptInfos = true;`
	`349`	`+ }`
`344`	`350`	`break;`
`345`	`351`	`}`
`346`	`352`	`}`