MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

refactoring, simplification

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2017-09-05 12:21:30 +03:00
parent 01f34755dc
commit fb90931349
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/formatting/engine/BlockIndentOptions.java
+10 -9
View File
@@ -43,18 +43,19 @@ public class BlockIndentOptions {
@NotNull
public CommonCodeStyleSettings.IndentOptions getIndentOptions(@NotNull AbstractBlockWrapper block) {
if (!myIndentOptions.isOverrideLanguageOptions()) {
final Language language = block.getLanguage();
if (language != null) {
final CommonCodeStyleSettings commonSettings = mySettings.getCommonSettings(language);
if (commonSettings != null) {
final CommonCodeStyleSettings.IndentOptions result = commonSettings.getIndentOptions();
if (result != null) {
return result;
}
if (myIndentOptions.isOverrideLanguageOptions()) return myIndentOptions;
final Language language = block.getLanguage();
if (language != null) {
final CommonCodeStyleSettings commonSettings = mySettings.getCommonSettings(language);
if (commonSettings != null) {
final CommonCodeStyleSettings.IndentOptions result = commonSettings.getIndentOptions();
if (result != null) {
return result;
}
}
}
return myIndentOptions;
}