From 47e77c976b6d94a7b5fca4ba05a7f4de6ee26506 Mon Sep 17 00:00:00 2001 From: Michael Crane Date: Tue, 6 Aug 2019 11:48:31 -0700 Subject: [PATCH] Remove unnecessary 'commandSucceeded' variable --- src/server/session.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/server/session.ts b/src/server/session.ts index 8be592a81b9..4ae5282a743 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -2508,7 +2508,6 @@ namespace ts.server { let request: protocol.Request | undefined; let relevantFile: protocol.FileRequestArgs | undefined; - let commandSucceeded = false; try { request = JSON.parse(message); relevantFile = request.arguments && (request as protocol.FileRequest).arguments.file ? (request as protocol.FileRequest).arguments : undefined; @@ -2527,8 +2526,6 @@ namespace ts.server { } // Note: Log before writing the response, else the editor can complete its activity before the server does - // Set 'commandSucceded' flag to ensure logStopCommand doesn't get called twice (e.g. if doOutput throws) - commandSucceeded = true; perfLogger.logStopCommand("" + request.command, "Success"); if (response) { this.doOutput(response, request.command, request.seq, /*success*/ true); @@ -2540,13 +2537,13 @@ namespace ts.server { catch (err) { if (err instanceof OperationCanceledException) { // Handle cancellation exceptions - if (!commandSucceeded) perfLogger.logStopCommand("" + (request && request.command), "Canceled: " + err); + perfLogger.logStopCommand("" + (request && request.command), "Canceled: " + err); this.doOutput({ canceled: true }, request!.command, request!.seq, /*success*/ true); return; } this.logErrorWorker(err, message, relevantFile); - if (!commandSucceeded) perfLogger.logStopCommand("" + (request && request.command), "Error: " + err); + perfLogger.logStopCommand("" + (request && request.command), "Error: " + err); this.doOutput( /*info*/ undefined,