Skip to content

Commit 839145c

Browse files
authored
Merge pull request #18517 from amcasey/RequestCountDecr25
Only decrement activeRequestCount on SetTypings responses
2 parents 9639b52 + 6ad8adc commit 839145c

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/server/server.ts

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -428,23 +428,22 @@ namespace ts.server {
428428
return;
429429
}
430430

431-
if (this.activeRequestCount > 0) {
432-
this.activeRequestCount--;
433-
}
434-
else {
435-
Debug.fail("Received too many responses");
436-
}
437-
438-
while (this.requestQueue.length > 0) {
439-
const queuedRequest = this.requestQueue.shift();
440-
if (this.requestMap.get(queuedRequest.operationId) === queuedRequest) {
441-
this.requestMap.delete(queuedRequest.operationId);
442-
this.scheduleRequest(queuedRequest);
443-
break;
431+
if (response.kind === ActionSet) {
432+
if (this.activeRequestCount > 0) {
433+
this.activeRequestCount--;
444434
}
445435

446-
if (this.logger.hasLevel(LogLevel.verbose)) {
447-
this.logger.info(`Skipping defunct request for: ${queuedRequest.operationId}`);
436+
while (this.requestQueue.length > 0) {
437+
const queuedRequest = this.requestQueue.shift();
438+
if (this.requestMap.get(queuedRequest.operationId) === queuedRequest) {
439+
this.requestMap.delete(queuedRequest.operationId);
440+
this.scheduleRequest(queuedRequest);
441+
break;
442+
}
443+
444+
if (this.logger.hasLevel(LogLevel.verbose)) {
445+
this.logger.info(`Skipping defunct request for: ${queuedRequest.operationId}`);
446+
}
448447
}
449448
}
450449

0 commit comments

Comments
 (0)