development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set global user preferences on updatePaths

Browse source 
https://github.com/Microsoft/TypeScript/issues/25739
This commit is contained in:
Matt Bierner 2018-07-26 17:35:04 -07:00
parent 21bb402655
commit 01989b1c67
2 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
extensions/typescript-language-features/src/features/fileConfigurationManager.ts
View file

@ -61,16 +61,24 @@ export default class FileConfigurationManager {
document: vscode.TextDocument,
token: vscode.CancellationToken
): Promise<void> {
const editor = vscode.window.visibleTextEditors.find(editor => editor.document.fileName === document.fileName);
if (editor) {
const formattingOptions = {
tabSize: editor.options.tabSize,
insertSpaces: editor.options.insertSpaces
} as vscode.FormattingOptions;
const formattingOptions = this.getFormattingOptions(document);
if (formattingOptions) {
return this.ensureConfigurationOptions(document, formattingOptions, token);
}
}
private getFormattingOptions(
document: vscode.TextDocument
): vscode.FormattingOptions | undefined {
const editor = vscode.window.visibleTextEditors.find(editor => editor.document.fileName === document.fileName);
return editor
? {
tabSize: editor.options.tabSize,
insertSpaces: editor.options.insertSpaces
} as vscode.FormattingOptions
: undefined;
}
public async ensureConfigurationOptions(
document: vscode.TextDocument,
options: vscode.FormattingOptions,
@ -95,6 +103,22 @@ export default class FileConfigurationManager {
await this.client.execute('configure', args, token);
}
public async setGlobalConfigurationFromDocument(
document: vscode.TextDocument,
token: vscode.CancellationToken,
): Promise<void> {
const formattingOptions = this.getFormattingOptions(document);
if (!formattingOptions) {
return;
}
const args: Proto.ConfigureRequestArguments = {
file: undefined /*global*/,
...this.getFileOptions(document, formattingOptions),
};
await this.client.execute('configure', args, token);
}
public reset() {
this.formatOptions.clear();
}

2
extensions/typescript-language-features/src/features/updatePathsOnRename.ts
View file

@ -230,7 +230,7 @@ class UpdateImportsOnFileRenameHandler {
newFile: string,
) {
const isDirectoryRename = fs.lstatSync(newFile).isDirectory();
await this.fileConfigurationManager.ensureConfigurationForDocument(document, nulToken);
await this.fileConfigurationManager.setGlobalConfigurationFromDocument(document, nulToken);
const args: Proto.GetEditsForFileRenameRequestArgs & { file: string } = {
file: targetResource,