From 7464fddc64118131097631ab6adbcfedeb99054b Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Sat, 1 Sep 2012 22:25:45 +0400 Subject: [PATCH] IDEA-90890 Some code formatting preferences ignored sometimes --- .../com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java index 2fba5f7128ab..b902a025a8a7 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java @@ -99,7 +99,8 @@ public class BraceEnforcer extends JavaJspRecursiveElementVisitor { private void processStatement(PsiStatement statement, PsiStatement blockCandidate, int options) { if (blockCandidate instanceof PsiBlockStatement || blockCandidate == null) return; - boolean forceNewLine = !FormatterUtil.isFormatterCalledExplicitly() && !ApplicationManager.getApplication().isUnitTestMode(); + boolean forceNewLine = !FormatterUtil.isFormatterCalledExplicitly() && !ApplicationManager.getApplication().isUnitTestMode() + && !myPostProcessor.getSettings().KEEP_CONTROL_STATEMENT_IN_ONE_LINE; if (forceNewLine || options == CommonCodeStyleSettings.FORCE_BRACES_ALWAYS || (options == CommonCodeStyleSettings.FORCE_BRACES_IF_MULTILINE && PostFormatProcessorHelper.isMultiline(statement)))