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

Fixed IDEA-79849 Global code style settings tab size is always reset after IDEA restart

Browse Source
This commit is contained in:
Rustam Vishnyakov
2012-02-17 13:43:04 +04:00
parent 4b93a9f823
commit 176fe5671e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
+4
View File
@@ -154,6 +154,8 @@ public class CodeStyleSettings extends CommonCodeStyleSettings implements Clonea
public boolean USE_SAME_INDENTS = false;
public boolean IGNORE_SAME_INDENTS_FOR_LANGUAGES = false;
@Deprecated
public final IndentOptions JAVA_INDENT_OPTIONS = new IndentOptions();
@Deprecated
@@ -611,6 +613,8 @@ public class CodeStyleSettings extends CommonCodeStyleSettings implements Clonea
copyOldIndentOptions("jsp", JSP_INDENT_OPTIONS);
copyOldIndentOptions("xml", XML_INDENT_OPTIONS);
}
if (USE_SAME_INDENTS) IGNORE_SAME_INDENTS_FOR_LANGUAGES = true;
}
private void copyOldIndentOptions(@NonNls final String extension, final IndentOptions options) {
platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class CommonCodeStyleSettings {
myIndentOptions.copyFrom(fileTypeIdentOptions);
rootSettings.unregisterAdditionalIndentOptions(myFileType);
}
else if (rootSettings.USE_SAME_INDENTS) {
else if (rootSettings.USE_SAME_INDENTS && !rootSettings.IGNORE_SAME_INDENTS_FOR_LANGUAGES) {
myIndentOptions.copyFrom(rootSettings.OTHER_INDENT_OPTIONS);
}
}