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

Use resource map for storing formatting options

Browse Source 
Try to normalize file cases on case-insensitive file systems
This commit is contained in:
Matt Bierner
2018-07-25 17:45:54 -07:00
parent 700ee37a24
commit 42e0c43645
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/typescript-language-features/src/features/definitionProviderBase.ts
View File

@@ -32,7 +32,7 @@ export default class TypeScriptDefinitionProviderBase {
return locations.map(location =>
typeConverters.Location.fromTextSpan(this.client.toResource(location.file), location));
} catch {
return [];
return undefined;
}
}
}

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

@@ -8,6 +8,7 @@ import * as Proto from '../protocol';
import { ITypeScriptServiceClient } from '../typescriptService';
import API from '../utils/api';
import { isTypeScriptDocument } from '../utils/languageModeIds';
import { ResourceMap } from '../utils/resourceMap';
function objsAreEqual<T>(a: T, b: T): boolean {
@@ -22,8 +23,8 @@ function objsAreEqual<T>(a: T, b: T): boolean {
}
interface FileConfiguration {
formatOptions: Proto.FormatCodeSettings;
preferences: Proto.UserPreferences;
readonly formatOptions: Proto.FormatCodeSettings;
readonly preferences: Proto.UserPreferences;
}
function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration): boolean {
@@ -35,18 +36,17 @@ function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration):
export default class FileConfigurationManager {
private onDidCloseTextDocumentSub: Disposable | undefined;
private formatOptions: { [key: string]: FileConfiguration | undefined } = Object.create(null);
private formatOptions = new ResourceMap<FileConfiguration>();
public constructor(
private readonly client: ITypeScriptServiceClient
) {
this.onDidCloseTextDocumentSub = Workspace.onDidCloseTextDocument((textDocument) => {
const key = textDocument.uri.toString();
// When a document gets closed delete the cached formatting options.
// This is necessary since the tsserver now closed a project when its
// last file in it closes which drops the stored formatting options
// as well.
delete this.formatOptions[key];
this.formatOptions.delete(textDocument.uri);
});
}
@@ -81,15 +81,13 @@ export default class FileConfigurationManager {
return;
}
const key = document.uri.toString();
const cachedOptions = this.formatOptions[key];
const cachedOptions = this.formatOptions.get(document.uri);
const currentOptions = this.getFileOptions(document, options);
if (cachedOptions && areFileConfigurationsEqual(cachedOptions, currentOptions)) {
return;
}
this.formatOptions[key] = currentOptions;
this.formatOptions.set(document.uri, currentOptions);
const args: Proto.ConfigureRequestArguments = {
file,
...currentOptions,
@@ -98,10 +96,9 @@ export default class FileConfigurationManager {
}
public reset() {
this.formatOptions = Object.create(null);
this.formatOptions.clear();
}
private getFileOptions(
document: TextDocument,
options: FormattingOptions