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

Fix issues with getting settings

Browse source
This commit is contained in:
Denis Gladkikh 2016-04-21 05:17:39 -07:00
parent 0a4e82fbbd
commit e63b4731ef
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/browser/actions/openSettings.ts
View file

@ -194,7 +194,7 @@ class DefaultSettingsInput extends StringEditorInput {
public static getInstance(instantiationService: IInstantiationService, configurationService: IConfigurationService): DefaultSettingsInput {
if (!DefaultSettingsInput.INSTANCE) {
let editorConfig = configurationService.getConfiguration<any>();
let defaults = getDefaultValuesContent(editorConfig.insertSpaces ? strings.repeat(' ', editorConfig.tabSize) : '\t');
let defaults = getDefaultValuesContent(editorConfig.editor.insertSpaces ? strings.repeat(' ', editorConfig.editor.tabSize) : '\t');
let defaultsHeader = '// ' + nls.localize('defaultSettingsHeader', "Overwrite settings by placing them into your settings file.");
DefaultSettingsInput.INSTANCE = instantiationService.createInstance(DefaultSettingsInput, nls.localize('defaultName', "Default Settings"), null, defaultsHeader + '\n' + defaults, 'application/json', false);

2
src/vs/workbench/parts/debug/node/debugConfigurationManager.ts
View file

@ -295,7 +295,7 @@ export class ConfigurationManager implements debug.IConfigurationManager {
configurations: adapter.initialConfigurations ? adapter.initialConfigurations : []
},
null,
editorConfig.insertSpaces ? strings.repeat(' ', editorConfig.tabSize) : '\t');
editorConfig.editor.insertSpaces ? strings.repeat(' ', editorConfig.editor.tabSize) : '\t');
});
});
}

4
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
View file

@ -241,8 +241,8 @@ class ConfigureTaskRunnerAction extends Action {
}
return contentPromise.then(content => {
let editorConfig = this.configurationService.getConfiguration<any>();
if (editorConfig.insertSpaces) {
content = content.replace(/(\n)(\t+)/g, (_, s1, s2) => s1 + strings.repeat(' ', s2.length * editorConfig.tabSize));
if (editorConfig.editor.insertSpaces) {
content = content.replace(/(\n)(\t+)/g, (_, s1, s2) => s1 + strings.repeat(' ', s2.length * editorConfig.editor.tabSize));
}
return this.fileService.createFile(this.contextService.toResource('.vscode/tasks.json'), content);
});