MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

reuse settings from filetype when possible

Browse Source 
#WEB-14236 fixed
This commit is contained in:
Dennis Ushakov
2014-11-21 20:42:31 +03:00
parent 83c4f8d63a
commit 3b4071b79b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigIndentOptionsProvider.java
+4 -3
View File
@@ -38,18 +38,19 @@ public class EditorConfigIndentOptionsProvider extends FileIndentOptionsProvider
final SettingsProviderComponent settingsProvider = SettingsProviderComponent.getInstance();
final List<EditorConfig.OutPair> outPairs = settingsProvider.getOutPairs(project, filePath);
// Apply editorconfig settings for the current editor
return applyCodeStyleSettings(project, outPairs, file);
return applyCodeStyleSettings(project, outPairs, file, settings);
}
private static CommonCodeStyleSettings.IndentOptions applyCodeStyleSettings(Project project,
final List<EditorConfig.OutPair> outPairs,
final VirtualFile file) {
final VirtualFile file,
final CodeStyleSettings settings) {
// Apply indent options
final String indentSize = Utils.configValueForKey(outPairs, indentSizeKey);
final String continuationIndentSize = Utils.configValueForKey(outPairs, continuationSizeKey);
final String tabWidth = Utils.configValueForKey(outPairs, tabWidthKey);
final String indentStyle = Utils.configValueForKey(outPairs, indentStyleKey);
final CommonCodeStyleSettings.IndentOptions indentOptions = new CommonCodeStyleSettings.IndentOptions();
final CommonCodeStyleSettings.IndentOptions indentOptions = (CommonCodeStyleSettings.IndentOptions)settings.getIndentOptions(file.getFileType()).clone();
if (applyIndentOptions(project, indentOptions, indentSize, continuationIndentSize, tabWidth, indentStyle, file.getCanonicalPath())) {
return indentOptions;
}