Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-23 19:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't cache cancelled ts server responses

Browse Source 
Fixes #64649
This commit is contained in:
Matt Bierner
2018-12-10 10:54:11 -08:00
parent 36cc3aa37a
commit aa990b4528
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/typescript-language-features/src/tsServer/cachedResponse.ts
View File

@@ -17,7 +17,7 @@ export class CachedResponse<T extends Proto.Response> {
f: () => Promise<ServerResponse<T>> f: () => Promise<ServerResponse<T>>
): Promise<ServerResponse<T>> { ): Promise<ServerResponse<T>> {
if (this.response && this.matches(document)) { if (this.response && this.matches(document)) {
return this.response; return this.response.then(result => result.type === 'cancelled' ? f() : result);
} }
return this.update(document, f()); return this.update(document, f());
} }
@@ -26,10 +26,22 @@ export class CachedResponse<T extends Proto.Response> {
return this.version === document.version && this.document === document.uri.toString(); return this.version === document.version && this.document === document.uri.toString();
} }
private update(document: vscode.TextDocument, response: Promise<ServerResponse<T>>): Promise<ServerResponse<T>> { private async update(
document: vscode.TextDocument,
response: Promise<ServerResponse<T>>
): Promise<ServerResponse<T>> {
this.response = response; this.response = response;
this.version = document.version; this.version = document.version;
this.document = document.uri.toString(); this.document = document.uri.toString();
return response;
const result = await response;
if (this.matches(document)) {
if (result.type === 'cancelled') {
// invalidate
this.version = -1;
this.document = '';
}
}
return result;
} }
} }