Line break correction for conditional directives is handled separately

Author: xterao

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

@@ -136,16 +136,7 @@ open class SqlBlock(
                 (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 && isConditionDirectiveParentGroup)
+        return isPrevBlockElseOrEnd || hasNoChildrenExceptLast
     }
 
     private fun shouldSaveSpaceForNewGroup(parent: SqlNewGroupBlock): Boolean {

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

@@ -17,7 +17,6 @@ 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
@@ -46,15 +45,7 @@ class SqlConditionalExpressionGroupBlock(
         }
     }
 
-    override fun createBlockIndentLen(): Int =
-        parentBlock?.let { parent ->
-            if (parent is SqlElConditionLoopCommentBlock) {
-                parent.indent.groupIndentLen
-            } else {
-                parent.indent.groupIndentLen.plus(1)
-            }
-        }
-            ?: offset
+    override fun createBlockIndentLen(): Int = parentBlock?.indent?.groupIndentLen?.plus(1) ?: 1
 
     override fun createGroupIndentLen(): Int = indent.indentLen.plus(1)
 }

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

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

src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlFormatPostProcessor.kt

@@ -29,9 +29,9 @@ import org.domaframework.doma.intellij.setting.SqlLanguage
 
 class SqlFormatPostProcessor : SqlPostProcessor() {
     override fun processElement(
-        source: PsiElement,
+        element: PsiElement,
         settings: CodeStyleSettings,
-    ): PsiElement = source
+    ): PsiElement = element
 
     override fun processText(
         source: PsiFile,