From a95a8c03686730211d8ce5c55ec8f9017fda69db Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 15 Jan 2014 19:27:05 +0400
Subject: [PATCH] Formatter: Move custom rule down by eliminating conflicting
 rule

---
 .../plugin/formatter/KotlinSpacingBuilder.kt  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt b/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
index 3789482b76c..1294f507f50 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
@@ -121,28 +121,6 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
     val jetSettings = settings.getCustomSettings(javaClass<JetCodeStyleSettings>())!!
     val jetCommonSettings = settings.getCommonSettings(JetLanguage.INSTANCE)!!
     return rules(settings) {
-        custom {
-            val lbraceRuleForControlStructure: (ASTBlock, ASTBlock, ASTBlock) -> Spacing? = {
-                parent, left, right ->
-                val blockOrExpression = right.getNode()!!.getFirstChildNode()
-                if (blockOrExpression != null && blockOrExpression.getElementType() == BLOCK) {
-                    val leftBrace = blockOrExpression.getFirstChildNode()
-                    when {
-                        leftBrace != null && leftBrace.getElementType() == LBRACE -> {
-                            val previousLeaf = FormatterUtil.getPreviousNonWhitespaceLeaf(leftBrace)
-                            val isAfterEolComment = previousLeaf != null && (previousLeaf.getElementType() == EOL_COMMENT)
-                            val keepLineBreaks = jetSettings.LBRACE_ON_NEXT_LINE || isAfterEolComment
-                            val minimumLF = if (jetSettings.LBRACE_ON_NEXT_LINE) 1 else 0
-                            Spacing.createSpacing(1, 1, minimumLF, keepLineBreaks, 0)
-                        }
-                        else -> null
-                    }
-                }
-                else null
-            }
-            inPosition(parent = IF, right = THEN).customRule(lbraceRuleForControlStructure)
-            inPosition(parent = IF, right = ELSE).customRule(lbraceRuleForControlStructure)
-        }
         simple {
             // ============ Line breaks ==============
             after(PACKAGE_DIRECTIVE).blankLines(1)
@@ -219,12 +197,34 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
 
             betweenInside(REFERENCE_EXPRESSION, FUNCTION_LITERAL_EXPRESSION, CALL_EXPRESSION).spaces(1)
 
-            aroundInside(ELSE_KEYWORD, IF).spaces(1)
-            betweenInside(RPAR, THEN, IF).spaces(1)
+            beforeInside(ELSE_KEYWORD, IF).spaces(1)
 
             between(RPAR, BODY).spaces(1)
         }
         custom {
+            val lbraceRuleForControlStructure: (ASTBlock, ASTBlock, ASTBlock) -> Spacing? = {
+                parent, left, right ->
+                val blockOrExpression = right.getNode()!!.getFirstChildNode()
+                val noBlockSpacing = Spacing.createSpacing(1, 1, 0, settings.KEEP_LINE_BREAKS, settings.KEEP_BLANK_LINES_IN_CODE)
+                if (blockOrExpression != null && blockOrExpression.getElementType() == BLOCK) {
+                    val leftBrace = blockOrExpression.getFirstChildNode()
+                    when {
+                        leftBrace != null && leftBrace.getElementType() == LBRACE -> {
+                            val previousLeaf = FormatterUtil.getPreviousNonWhitespaceLeaf(leftBrace)
+                            val isAfterEolComment = previousLeaf != null && (previousLeaf.getElementType() == EOL_COMMENT)
+                            val keepLineBreaks = jetSettings.LBRACE_ON_NEXT_LINE || isAfterEolComment
+                            val minimumLF = if (jetSettings.LBRACE_ON_NEXT_LINE) 1 else 0
+                            Spacing.createSpacing(1, 1, minimumLF, keepLineBreaks, 0)
+                        }
+                        else -> noBlockSpacing
+                    }
+                }
+                else noBlockSpacing
+            }
+            inPosition(parent = IF, right = THEN).customRule(lbraceRuleForControlStructure)
+            inPosition(parent = IF, right = ELSE).customRule(lbraceRuleForControlStructure)
+
+
             val spacesInSimpleFunction = if (jetSettings.INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD) 1 else 0
             inPosition(parent = FUNCTION_LITERAL,
                        left = LBRACE,