Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check cancellation token earlier and avoid capturing resolve (#166416)

Browse Source
This commit is contained in:
Matt Bierner
2022-11-15 16:33:01 -08:00
committed by GitHub
parent a2fee51e0b
commit 7d6c575031
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
View File

@@ -77,24 +77,27 @@ export default class FileConfigurationManager extends Disposable {
const cachedOptions = this.formatOptions.get(document.uri); const cachedOptions = this.formatOptions.get(document.uri);
if (cachedOptions) { if (cachedOptions) {
const cachedOptionsValue = await cachedOptions; const cachedOptionsValue = await cachedOptions;
if (token.isCancellationRequested) {
return;
}
if (cachedOptionsValue && areFileConfigurationsEqual(cachedOptionsValue, currentOptions)) { if (cachedOptionsValue && areFileConfigurationsEqual(cachedOptionsValue, currentOptions)) {
return; return;
} }
} }
let resolve: (x: FileConfiguration | undefined) => void; const task = (async () => {
this.formatOptions.set(document.uri, new Promise<FileConfiguration | undefined>(r => resolve = r)); try {
const response = await this.client.execute('configure', { file, ...currentOptions }, token);
return response.type === 'response' ? currentOptions : undefined;
} catch {
return undefined;
}
})();
const args: Proto.ConfigureRequestArguments = { this.formatOptions.set(document.uri, task);
file,
...currentOptions, await task;
};
try {
const response = await this.client.execute('configure', args, token);
resolve!(response.type === 'response' ? currentOptions : undefined);
} finally {
resolve!(undefined);
}
} }
public async setGlobalConfigurationFromDocument( public async setGlobalConfigurationFromDocument(