Fixed else handling when used as part of ternary expression

pinterest · May 28, 2017 · d7146cb · d7146cb
1 parent 41ec38f
commit d7146cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...ard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt b/...ard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundKeywordRule.kt
@@ -37,7 +37,8 @@ class SpacingAroundKeywordRule : Rule("keyword-spacing") {
         if (noLFBeforeSet.contains(node.elementType) && node is LeafPsiElement) {
             val prevLeaf = PsiTreeUtil.prevLeaf(node)
             if (prevLeaf is PsiWhiteSpaceImpl && prevLeaf.textContains('\n') &&
-                (node.elementType != ELSE_KEYWORD || node.parent !is KtWhenEntry)) {
+                (node.elementType != ELSE_KEYWORD || node.parent !is KtWhenEntry) &&
+                (PsiTreeUtil.prevLeaf(prevLeaf)?.textMatches("}") ?: false)) {
                 emit(node.startOffset, "Unexpected newline before \"${node.text}\"", true)
                 if (autoCorrect) {
                     prevLeaf.rawReplaceWithText(" ")

diff --git a/...src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundKeywordRuleTest.kt b/...src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/SpacingAroundKeywordRuleTest.kt
@@ -27,6 +27,10 @@ class SpacingAroundKeywordRuleTest {
                 if (true) {
                 } else {}
                 if (true) {} else {}
+                if (true)
+                    println()
+                else
+                    entry.value
 
                 try {
                     "".trim()