nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 15:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't request inline hints repeatedly

Browse Source
This commit is contained in:
Aleksey Kladov 2019-12-30 22:53:21 +01:00
parent 23bac12062
commit cdd7118cbf
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editors/code/src/ctx.ts
View File

@ -62,20 +62,23 @@ export class Ctx {
this.extCtx.subscriptions.push(d);
}
async sendRequestWithRetry<R>(method: string, param: any): Promise<R> {
async sendRequestWithRetry<R>(method: string, param: any, token: vscode.CancellationToken): Promise<R> {
await this.client.onReady();
const nRetries = 3;
for (let triesLeft = nRetries; ; triesLeft--) {
for (const delay of [2, 4, 6, 8, 10, null]) {
try {
return await this.client.sendRequest(method, param);
return await this.client.sendRequest(method, param, token);
} catch (e) {
if (e.code === lc.ErrorCodes.ContentModified && triesLeft > 0) {
if (e.code === lc.ErrorCodes.ContentModified && delay !== null) {
await sleep(10 * (1 << delay))
continue;
}
throw e;
}
}
throw 'unreachable'
}
}
export type Cmd = (...args: any[]) => any;
const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))

23
editors/code/src/inlay_hints.ts
View File

@ -41,6 +41,7 @@ const typeHintDecorationType = vscode.window.createTextEditorDecorationType({
});
class HintsUpdater {
private pending: Map<string, vscode.CancellationTokenSource> = new Map();
private ctx: Ctx;
private enabled = true;
@ -67,7 +68,8 @@ class HintsUpdater {
private async refreshEditor(editor: vscode.TextEditor): Promise<void> {
const newHints = await this.queryHints(editor.document.uri.toString());
const newDecorations = (newHints ? newHints : []).map(hint => ({
if (newHints == null) return;
const newDecorations = newHints.map(hint => ({
range: hint.range,
renderOptions: {
after: {
@ -98,9 +100,20 @@ class HintsUpdater {
const request: InlayHintsParams = {
textDocument: { uri: documentUri },
};
return this.ctx.sendRequestWithRetry<InlayHint[] | null>(
'rust-analyzer/inlayHints',
request,
);
let tokenSource = new vscode.CancellationTokenSource();
let prev = this.pending.get(documentUri);
if (prev) prev.cancel()
this.pending.set(documentUri, tokenSource);
try {
return await this.ctx.sendRequestWithRetry<InlayHint[] | null>(
'rust-analyzer/inlayHints',
request,
tokenSource.token,
);
} finally {
if (!tokenSource.token.isCancellationRequested) {
this.pending.delete(documentUri)
}
}
}
}