Merge pull request microsoft#18491 from amcasey/RequestCountDecr

amcasey · web-flow · commit 76fd4fe2895b · 2017-09-15T10:50:52.000-07:00
Only decrement activeRequestCount on SetTypings responses
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -433,23 +433,25 @@ namespace ts.server {
                 return;
             }
 
-            if (this.activeRequestCount > 0) {
-                this.activeRequestCount--;
-            }
-            else {
-                Debug.fail("Received too many responses");
-            }
-
-            while (this.requestQueue.length > 0) {
-                const queuedRequest = this.requestQueue.shift();
-                if (this.requestMap.get(queuedRequest.operationId) === queuedRequest) {
-                    this.requestMap.delete(queuedRequest.operationId);
-                    this.scheduleRequest(queuedRequest);
-                    break;
+            if (response.kind === ActionSet) {
+                if (this.activeRequestCount > 0) {
+                    this.activeRequestCount--;
+                }
+                else {
+                    Debug.fail("Received too many responses");
                 }
 
-                if (this.logger.hasLevel(LogLevel.verbose)) {
-                    this.logger.info(`Skipping defunct request for: ${queuedRequest.operationId}`);
+                while (this.requestQueue.length > 0) {
+                    const queuedRequest = this.requestQueue.shift();
+                    if (this.requestMap.get(queuedRequest.operationId) === queuedRequest) {
+                        this.requestMap.delete(queuedRequest.operationId);
+                        this.scheduleRequest(queuedRequest);
+                        break;
+                    }
+
+                    if (this.logger.hasLevel(LogLevel.verbose)) {
+                        this.logger.info(`Skipping defunct request for: ${queuedRequest.operationId}`);
+                    }
                 }
             }
 
