Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 00:28:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better fix for #58518 to avoid possible duplicated configure requests

Browse Source
This commit is contained in:
Matt Bierner
2018-09-24 16:42:05 -07:00
parent 58a72ab6cf
commit 484bf49abf
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration):
export default class FileConfigurationManager {
private onDidCloseTextDocumentSub: vscode.Disposable | undefined;
private formatOptions = new ResourceMap<FileConfiguration>();
private readonly formatOptions = new ResourceMap<Promise<FileConfiguration | undefined>>();
public constructor(
private readonly client: ITypeScriptServiceClient
@@ -89,19 +89,27 @@ export default class FileConfigurationManager {
return;
}
const cachedOptions = this.formatOptions.get(document.uri);
const currentOptions = this.getFileOptions(document, options);
if (cachedOptions && areFileConfigurationsEqual(cachedOptions, currentOptions)) {
return;
const cachedOptions = this.formatOptions.get(document.uri);
if (cachedOptions) {
const cachedOptionsValue = await cachedOptions;
if (cachedOptionsValue && areFileConfigurationsEqual(cachedOptionsValue, currentOptions)) {
return;
}
}
let resolve: (x: FileConfiguration | undefined) => void;
this.formatOptions.set(document.uri, new Promise<FileConfiguration | undefined>(r => resolve = r));
const args: Proto.ConfigureRequestArguments = {
file,
...currentOptions,
};
const response = await this.client.execute('configure', args, token);
if (response.type === 'response') {
this.formatOptions.set(document.uri, currentOptions);
try {
const response = await this.client.execute('configure', args, token);
resolve!(response.type === 'response' ? currentOptions : undefined);
} finally {
resolve!(undefined);
}
}