Reflect the fix for the overwritten line-break control in conditional directives.

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlBlock.kt

@@ -135,8 +135,16 @@ open class SqlBlock(
             prevBlock is SqlElConditionLoopCommentBlock &&
                 (prevBlock.conditionType.isElse() || prevBlock.conditionType.isEnd())
         val hasNoChildrenExceptLast = parent.childBlocks.dropLast(1).isEmpty()
+        if (parent.conditionType.isElse()) {
+            return prevBlocks.isEmpty()
+        }
+
+        val isConditionDirectiveParentGroup =
+            parent.parentBlock?.let { grand ->
+                grand is SqlNewGroupBlock
+            } == true
 
-        return isPrevBlockElseOrEnd || hasNoChildrenExceptLast
+        return isPrevBlockElseOrEnd || (hasNoChildrenExceptLast && isConditionDirectiveParentGroup)
     }
 
     private fun shouldSaveSpaceForNewGroup(parent: SqlNewGroupBlock): Boolean {

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

@@ -17,6 +17,7 @@ package org.domaframework.doma.intellij.formatter.block.group.keyword.condition
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
@@ -45,7 +46,15 @@ class SqlConditionalExpressionGroupBlock(
         }
     }
 
-    override fun createBlockIndentLen(): Int = parentBlock?.indent?.groupIndentLen?.plus(1) ?: 1
+    override fun createBlockIndentLen(): Int =
+        parentBlock?.let { parent ->
+            if (parent is SqlElConditionLoopCommentBlock) {
+                parent.indent.groupIndentLen
+            } else {
+                parent.indent.groupIndentLen.plus(1)
+            }
+        }
+            ?: offset
 
     override fun createGroupIndentLen(): Int = indent.indentLen.plus(1)
 }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubGroupBlock.kt

@@ -50,6 +50,7 @@ abstract class SqlSubGroupBlock(
                 SqlWithCommonTableGroupBlock::class,
                 SqlWithColumnGroupBlock::class,
                 SqlCreateViewGroupBlock::class,
+                SqlElConditionLoopCommentBlock::class,
             )
     }