language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

editor/code: Assert types in catch in sendRequestWithRetry() properly

Browse source
This commit is contained in:
Tetsuharu Ohzeki 2023-07-10 23:12:42 +09:00
parent 2f6d545535
commit fd31006646
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
editors/code/src/util.ts
View file

@ -69,20 +69,24 @@ export async function sendRequestWithRetry<TParam, TRet>(
return await (token return await (token
? client.sendRequest(reqType, param, token) ? client.sendRequest(reqType, param, token)
: client.sendRequest(reqType, param)); : client.sendRequest(reqType, param));
} catch (error) { } catch (error: unknown) {
if (delay === null) { if (delay === null) {
log.warn("LSP request timed out", { method: reqType.method, param, error }); log.warn("LSP request timed out", { method: reqType.method, param, error });
throw error; throw error;
} }
if (error.code === lc.LSPErrorCodes.RequestCancelled) {
throw error; if (error instanceof lc.ResponseError) {
switch (error.code) {
case lc.LSPErrorCodes.RequestCancelled:
throw error;
case lc.LSPErrorCodes.ContentModified:
await sleep(delay);
continue;
}
} }
if (error.code !== lc.LSPErrorCodes.ContentModified) { log.warn("LSP request failed", { method: reqType.method, param, error });
log.warn("LSP request failed", { method: reqType.method, param, error }); throw error;
throw error;
}
await sleep(delay);
} }
} }
throw "unreachable"; throw "unreachable";