From 1958209dafdc3f6175f088b4aaf3fdb797b82189 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 20 Jun 2019 17:57:09 -0700 Subject: [PATCH] Include server id in TS server errors --- .../typescript-language-features/src/tsServer/server.ts | 2 +- .../src/tsServer/serverError.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts index 9a2132fa27e..4a19cde00e7 100644 --- a/extensions/typescript-language-features/src/tsServer/server.ts +++ b/extensions/typescript-language-features/src/tsServer/server.ts @@ -189,7 +189,7 @@ export class ProcessBasedTsServer extends Disposable implements ITypeScriptServe // Special case where response itself is successful but there is not any data to return. callback.onSuccess(ServerResponse.NoContent); } else { - callback.onError(TypeScriptServerError.create(this._version, response)); + callback.onError(TypeScriptServerError.create(this._serverId, this._version, response)); } } diff --git a/extensions/typescript-language-features/src/tsServer/serverError.ts b/extensions/typescript-language-features/src/tsServer/serverError.ts index 062c82f1336..cb5cb8035f1 100644 --- a/extensions/typescript-language-features/src/tsServer/serverError.ts +++ b/extensions/typescript-language-features/src/tsServer/serverError.ts @@ -9,20 +9,22 @@ import { TypeScriptVersion } from '../utils/versionProvider'; export class TypeScriptServerError extends Error { public static create( + serverId: string, version: TypeScriptVersion, response: Proto.Response ): TypeScriptServerError { const parsedResult = TypeScriptServerError.parseErrorText(version, response); - return new TypeScriptServerError(version, response, parsedResult ? parsedResult.message : undefined, parsedResult ? parsedResult.stack : undefined); + return new TypeScriptServerError(serverId, version, response, parsedResult ? parsedResult.message : undefined, parsedResult ? parsedResult.stack : undefined); } private constructor( + serverId: string, version: TypeScriptVersion, private readonly response: Proto.Response, public readonly serverMessage: string | undefined, public readonly serverStack: string | undefined ) { - super(`TypeScript Server Error (${version.versionString})\n${serverMessage}\n${serverStack}`); + super(`<${serverId}> TypeScript Server Error (${version.versionString})\n${serverMessage}\n${serverStack}`); } public get serverErrorText() { return this.response.message; } -- GitLab