Control line breaks for CASE, WHEN, and conditional keywords (AND, OR) in CASE-END

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionKeywordGroupBlock.kt

@@ -57,6 +57,7 @@ class SqlConditionKeywordGroupBlock(
         return when (parent) {
             is SqlElConditionLoopCommentBlock -> parent.indent.groupIndentLen
             is SqlSubGroupBlock -> calculateSubGroupIndent(groupLen)
+            is SqlInlineSecondGroupBlock -> calculateInlineSecondIndent(groupLen)
             else -> parent.indent.groupIndentLen - getNodeText().length
         }
     }
@@ -68,6 +69,13 @@ class SqlConditionKeywordGroupBlock(
             groupLen + 1
         }
 
+    private fun calculateInlineSecondIndent(groupLen: Int): Int =
+        if (getNodeText() == "and") {
+            groupLen.plus(1)
+        } else {
+            groupLen.plus(2)
+        }
+
     override fun createGroupIndentLen(): Int {
         parentBlock?.let { parent ->
             if (parent is SqlWhereGroupBlock) {

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/inline/SqlInlineGroupBlock.kt

@@ -60,4 +60,11 @@ open class SqlInlineGroupBlock(
         } ?: 1
 
     override fun createGroupIndentLen(): Int = indent.indentLen.plus(getNodeText().length)
+
+    override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
+        if (lastGroup is SqlInlineSecondGroupBlock) {
+            return true
+        }
+        return super.isSaveSpace(lastGroup)
+    }
 }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/inline/SqlInlineSecondGroupBlock.kt

@@ -66,6 +66,5 @@ open class SqlInlineSecondGroupBlock(
 
     override fun createGroupIndentLen(): Int = indent.indentLen.plus(getNodeText().length)
 
-    override fun isSaveSpace(lastGroup: SqlBlock?): Boolean =
-        (parentBlock as? SqlInlineGroupBlock)?.inlineConditions?.dropLast(1)?.isEmpty() != true
+    override fun isSaveSpace(lastGroup: SqlBlock?): Boolean = true
 }