From e6572ca1ea479fed2a330f59950e2554a04f834f Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 17 Sep 2018 13:59:18 -0700 Subject: [PATCH] Make sure we don't log an exception for cancelled ts requests while server is still coming online Fixes #58781 --- .../src/features/bufferSyncSupport.ts | 2 +- .../typescript-language-features/src/features/folding.ts | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts index d180d95c460..d31b83970dc 100644 --- a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts +++ b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts @@ -157,7 +157,7 @@ class GetErrRequest { }; client.executeAsync('geterr', args, _token.token) - .then(undefined, () => { }) + .catch(() => true) .then(() => { if (this._done) { return; diff --git a/extensions/typescript-language-features/src/features/folding.ts b/extensions/typescript-language-features/src/features/folding.ts index 471cf26cff2..a14be50a9a1 100644 --- a/extensions/typescript-language-features/src/features/folding.ts +++ b/extensions/typescript-language-features/src/features/folding.ts @@ -26,7 +26,13 @@ class TypeScriptFoldingProvider implements vscode.FoldingRangeProvider { } const args: Proto.FileRequestArgs = { file }; - const { body } = await this.client.execute('getOutliningSpans', args, token); + let body: Proto.OutliningSpan[] | undefined; + try { + body = (await this.client.execute('getOutliningSpans', args, token)).body; + } catch { + // noop + } + if (!body) { return; }