From 31ae64644864257b2375167df56c0b2e3839a9fd Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sat, 8 Feb 2020 21:38:29 +0200 Subject: vscode: add comment on possible UnhandledPromise rejection error --- editors/code/src/inlay_hints.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'editors/code') diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts index c317a9213..12d7ddf0d 100644 --- a/editors/code/src/inlay_hints.ts +++ b/editors/code/src/inlay_hints.ts @@ -27,7 +27,9 @@ export function activateInlayHints(ctx: Ctx) { ctx.subscriptions ); - ctx.onDidRestart(_ => hintsUpdater.setEnabled(ctx.config.displayInlayHints)); + // We pass async function though it will not be awaited when called, + // thus Promise rejections won't be handled, but this should never throw in fact... + ctx.onDidRestart(async _ => hintsUpdater.setEnabled(ctx.config.displayInlayHints)); } interface InlayHintsParams { -- cgit v1.2.3 From bd113623a02dc253549464667af8931e2ff378bc Mon Sep 17 00:00:00 2001 From: Veetaha Date: Mon, 17 Feb 2020 01:47:14 +0200 Subject: vscode: minor refactorings --- editors/code/src/config.ts | 1 - editors/code/src/ctx.ts | 12 ++++------- editors/code/src/inlay_hints.ts | 45 ++++++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 30 deletions(-) (limited to 'editors/code') diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 70cb0a612..53e2a414b 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -44,7 +44,6 @@ export class Config { this.refreshConfig(); } - private refreshConfig() { this.cfg = vscode.workspace.getConfiguration(Config.rootSection); console.log("Using configuration:", this.cfg); diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts index 9fcf2ec38..ff6245f78 100644 --- a/editors/code/src/ctx.ts +++ b/editors/code/src/ctx.ts @@ -91,15 +91,11 @@ export async function sendRequestWithRetry( for (const delay of [2, 4, 6, 8, 10, null]) { try { return await (token ? client.sendRequest(method, param, token) : client.sendRequest(method, param)); - } catch (e) { - if ( - e.code === lc.ErrorCodes.ContentModified && - delay !== null - ) { - await sleep(10 * (1 << delay)); - continue; + } catch (err) { + if (delay === null || err.code !== lc.ErrorCodes.ContentModified) { + throw err; } - throw e; + await sleep(10 * (1 << delay)); } } throw 'unreachable'; diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts index 12d7ddf0d..3896878cd 100644 --- a/editors/code/src/inlay_hints.ts +++ b/editors/code/src/inlay_hints.ts @@ -38,7 +38,7 @@ interface InlayHintsParams { interface InlayHint { range: vscode.Range; - kind: string; + kind: "TypeHint" | "ParameterHint"; label: string; } @@ -55,7 +55,7 @@ const parameterHintDecorationType = vscode.window.createTextEditorDecorationType }); class HintsUpdater { - private pending: Map = new Map(); + private pending = new Map(); private ctx: Ctx; private enabled: boolean; @@ -64,30 +64,36 @@ class HintsUpdater { this.enabled = ctx.config.displayInlayHints; } - async setEnabled(enabled: boolean) { + async setEnabled(enabled: boolean): Promise { if (this.enabled == enabled) return; this.enabled = enabled; if (this.enabled) { - await this.refresh(); - } else { - this.allEditors.forEach(it => { - this.setTypeDecorations(it, []); - this.setParameterDecorations(it, []); - }); + return await this.refresh(); } + this.allEditors.forEach(it => { + this.setTypeDecorations(it, []); + this.setParameterDecorations(it, []); + }); } async refresh() { if (!this.enabled) return; - const promises = this.allEditors.map(it => this.refreshEditor(it)); - await Promise.all(promises); + await Promise.all(this.allEditors.map(it => this.refreshEditor(it))); + } + + private get allEditors(): vscode.TextEditor[] { + return vscode.window.visibleTextEditors.filter( + editor => editor.document.languageId === 'rust', + ); } private async refreshEditor(editor: vscode.TextEditor): Promise { const newHints = await this.queryHints(editor.document.uri.toString()); if (newHints == null) return; - const newTypeDecorations = newHints.filter(hint => hint.kind === 'TypeHint') + + const newTypeDecorations = newHints + .filter(hint => hint.kind === 'TypeHint') .map(hint => ({ range: hint.range, renderOptions: { @@ -98,7 +104,8 @@ class HintsUpdater { })); this.setTypeDecorations(editor, newTypeDecorations); - const newParameterDecorations = newHints.filter(hint => hint.kind === 'ParameterHint') + const newParameterDecorations = newHints + .filter(hint => hint.kind === 'ParameterHint') .map(hint => ({ range: hint.range, renderOptions: { @@ -110,12 +117,6 @@ class HintsUpdater { this.setParameterDecorations(editor, newParameterDecorations); } - private get allEditors(): vscode.TextEditor[] { - return vscode.window.visibleTextEditors.filter( - editor => editor.document.languageId === 'rust', - ); - } - private setTypeDecorations( editor: vscode.TextEditor, decorations: vscode.DecorationOptions[], @@ -139,12 +140,14 @@ class HintsUpdater { private async queryHints(documentUri: string): Promise { const client = this.ctx.client; if (!client) return null; + const request: InlayHintsParams = { textDocument: { uri: documentUri }, }; const tokenSource = new vscode.CancellationTokenSource(); - const prev = this.pending.get(documentUri); - if (prev) prev.cancel(); + const prevHintsRequest = this.pending.get(documentUri); + prevHintsRequest?.cancel(); + this.pending.set(documentUri, tokenSource); try { return await sendRequestWithRetry( -- cgit v1.2.3