Merge pull request microsoft#20173 from RyanCavanaugh/fixTypingsInstallerAgain_master

amcasey · web-flow · commit e934c305136a · 2017-11-27T10:47:05.000-08:00
Always send a response to installTypings even if all types are cached
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
@@ -1018,7 +1018,7 @@ namespace ts.projectSystem {
                 }
             };
             session.executeCommand(changeRequest);
-            host.checkTimeoutQueueLengthAndRun(0); // This enqueues the updategraph and refresh inferred projects
+            host.checkTimeoutQueueLengthAndRun(2); // This enqueues the updategraph and refresh inferred projects
             const version2 = proj.getCachedUnresolvedImportsPerFile_TestOnly().getVersion();
             assert.equal(version1, version2, "set of unresolved imports should not change");
         });
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
@@ -257,8 +257,9 @@ namespace ts.server.typingsInstaller {
             const filteredTypings = this.filterTypings(typingsToInstall);
             if (filteredTypings.length === 0) {
                 if (this.log.isEnabled()) {
-                    this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`);
+                    this.log.writeLine(`All typings are known to be missing or invalid - no need to install more typings`);
                 }
+                this.sendResponse(this.createSetTypings(req, currentlyCachedTypings));
                 return;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ namespace ts.projectSystem {`
`1018`	`1018`	`}`
`1019`	`1019`	`};`
`1020`	`1020`	`session.executeCommand(changeRequest);`
`1021`		`- host.checkTimeoutQueueLengthAndRun(0); // This enqueues the updategraph and refresh inferred projects`
	`1021`	`+ host.checkTimeoutQueueLengthAndRun(2); // This enqueues the updategraph and refresh inferred projects`
`1022`	`1022`	`const version2 = proj.getCachedUnresolvedImportsPerFile_TestOnly().getVersion();`
`1023`	`1023`	`assert.equal(version1, version2, "set of unresolved imports should not change");`
`1024`	`1024`	`});`
Original file line number	Diff line number	Diff line change
`@@ -257,8 +257,9 @@ namespace ts.server.typingsInstaller {`
`257`	`257`	`const filteredTypings = this.filterTypings(typingsToInstall);`
`258`	`258`	`if (filteredTypings.length === 0) {`
`259`	`259`	`if (this.log.isEnabled()) {`
`260`		- this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`);
	`260`	+ this.log.writeLine(`All typings are known to be missing or invalid - no need to install more typings`);
`261`	`261`	`}`
	`262`	`+ this.sendResponse(this.createSetTypings(req, currentlyCachedTypings));`
`262`	`263`	`return;`
`263`	`264`	`}`
`264`	`265`