From 181c5aa0d7129f9e39704f771eb3c3053c17fe27 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Mon, 28 Aug 2017 18:16:37 +0200
Subject: [PATCH] [#6007] Bad formatting of CASE WHEN EXISTS expressions

---
 .../org/jooq/impl/CaseConditionStepImpl.java  | 36 +++++++------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
index 083ef1078d..2cfffaa20a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
@@ -185,36 +185,26 @@ final class CaseConditionStepImpl<T> extends AbstractFunction<T> implements Case
 
         @Override
         public final void accept(Context<?> ctx) {
-            ctx.formatIndentLockStart()
-               .visit(K_CASE)
-               .formatIndentLockStart();
+            ctx.visit(K_CASE)
+               .formatIndentStart()
+               .formatSeparator();
 
             int size = conditions.size();
             for (int i = 0; i < size; i++) {
-                if (i > 0) {
-                    ctx.formatNewLine();
-                }
+                if (i > 0)
+                    ctx.formatSeparator();
 
-                ctx.sql(' ').visit(K_WHEN).sql(' ').visit(conditions.get(i))
-                   .sql(' ').visit(K_THEN).sql(' ').visit(results.get(i));
+                ctx.visit(K_WHEN).sql(' ').visit(conditions.get(i)).sql(' ')
+                   .visit(K_THEN).sql(' ').visit(results.get(i));
             }
 
-            if (otherwise != null) {
-                ctx.formatNewLine()
-                   .sql(' ').visit(K_ELSE).sql(' ').visit(otherwise);
-            }
+            if (otherwise != null)
+                ctx.formatSeparator()
+                   .visit(K_ELSE).sql(' ').visit(otherwise);
 
-            ctx.formatIndentLockEnd();
-
-            if (size > 1 || otherwise != null) {
-                ctx.formatSeparator();
-            }
-            else {
-                ctx.sql(' ');
-            }
-
-            ctx.visit(K_END)
-               .formatIndentLockEnd();
+            ctx.formatIndentEnd()
+               .formatSeparator()
+               .visit(K_END);
         }
     }
 }