Refactor SQL block handling to use isParentConditionLoopDirective for improved readability and consistency

Author: xterao

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

@@ -105,7 +105,6 @@ open class SqlBlock(
     protected fun isConditionLoopDirectiveRegisteredBeforeParent(): Boolean {
         val firstPrevBlock = (prevBlocks.lastOrNull() as? SqlElConditionLoopCommentBlock)
         parentBlock?.let { parent ->
-
             return (childBlocks.firstOrNull() as? SqlElConditionLoopCommentBlock)?.isBeforeParentBlock() == true ||
                 firstPrevBlock != null &&
                 firstPrevBlock.conditionEnd != null &&
@@ -132,7 +131,7 @@ open class SqlBlock(
     protected fun isElementAfterConditionLoopDirective(): Boolean =
         (parentBlock as? SqlElConditionLoopCommentBlock)?.let { parent ->
             parent.childBlocks.firstOrNull() == this &&
-                (parent.parentBlock is SqlNewGroupBlock || parent.parentBlock is SqlElConditionLoopCommentBlock)
+                (parent.parentBlock is SqlNewGroupBlock || parent.isParentConditionLoopDirective())
         } == true
 
     protected fun isElementAfterConditionLoopEnd(): Boolean {
@@ -160,6 +159,8 @@ open class SqlBlock(
                 )?.conditionEnd
         )
 
+    fun isParentConditionLoopDirective(): Boolean = parentBlock is SqlElConditionLoopCommentBlock
+
     protected fun isFirstChildConditionLoopDirective(): Boolean = childBlocks.firstOrNull() is SqlElConditionLoopCommentBlock
 
     fun getChildBlocksDropLast(

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

@@ -359,7 +359,6 @@ open class SqlFileBlock(
             }
 
             is SqlInlineGroupBlock -> {
-                // case-end
                 blockRelationBuilder.updateGroupBlockParentAndAddGroup(
                     childBlock,
                 )
@@ -471,7 +470,7 @@ open class SqlFileBlock(
             return SqlCustomSpacingBuilder().getSpacing(childBlock2)
         }
 
-        if (childBlock1 is SqlWhitespaceBlock && childBlock2.parentBlock is SqlElConditionLoopCommentBlock) {
+        if (childBlock1 is SqlWhitespaceBlock && childBlock2.isParentConditionLoopDirective()) {
             val child1 = childBlock2.parentBlock as SqlElConditionLoopCommentBlock
             SqlCustomSpacingBuilder()
                 .getSpacingElDirectiveComment(child1, childBlock2)

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

@@ -17,7 +17,6 @@ package org.domaframework.doma.intellij.formatter.block
 
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.conflict.SqlDoGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlNewGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
@@ -96,7 +95,7 @@ open class SqlKeywordBlock(
             }
 
             else -> {
-                if (parentBlock is SqlElConditionLoopCommentBlock) {
+                if (isParentConditionLoopDirective()) {
                     parentBlock?.indent?.groupIndentLen ?: 1
                 } else {
                     parentBlock?.indent?.groupIndentLen?.plus(1) ?: 1

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

@@ -18,7 +18,6 @@ package org.domaframework.doma.intellij.formatter.block.comma
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
@@ -49,5 +48,5 @@ class SqlArrayCommaBlock(
 
     override fun createGroupIndentLen(): Int = indent.indentLen.plus(1)
 
-    override fun isSaveSpace(lastGroup: SqlBlock?): Boolean = parentBlock is SqlElConditionLoopCommentBlock
+    override fun isSaveSpace(lastGroup: SqlBlock?): Boolean = isParentConditionLoopDirective()
 }

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

@@ -182,7 +182,7 @@ open class SqlKeywordGroupBlock(
 
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         val conditionLastGroup =
-            if (parentBlock is SqlElConditionLoopCommentBlock) {
+            if (isParentConditionLoopDirective()) {
                 parentBlock?.parentBlock
             } else {
                 lastGroup

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

@@ -19,6 +19,7 @@ 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.create.SqlCreateKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.option.SqlSecondOptionKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlWhereGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock

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

@@ -18,7 +18,6 @@ package org.domaframework.doma.intellij.formatter.block.group.keyword.inline
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 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.SqlNewGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
@@ -51,7 +50,7 @@ open class SqlInlineGroupBlock(
 
     override fun createBlockIndentLen(): Int =
         parentBlock?.let { parent ->
-            if (parent is SqlElConditionLoopCommentBlock || childBlocks.firstOrNull() is SqlElConditionLoopCommentBlock ||
+            if (isParentConditionLoopDirective() || isFirstChildConditionLoopDirective() ||
                 parent is SqlSubGroupBlock
             ) {
                 parent.indent.groupIndentLen

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/option/SqlExistsGroupBlock.kt

@@ -17,7 +17,6 @@ package org.domaframework.doma.intellij.formatter.block.group.keyword.option
 
 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.keyword.create.SqlCreateKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineSecondGroupBlock
@@ -38,7 +37,7 @@ class SqlExistsGroupBlock(
 
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
-            if (parent.parentBlock is SqlElConditionLoopCommentBlock) {
+            if (parent.isParentConditionLoopDirective()) {
                 return parent.indent.groupIndentLen
             }
         }
@@ -47,9 +46,14 @@ class SqlExistsGroupBlock(
 
     override fun createGroupIndentLen(): Int {
         // If this group is not the top of a line, there must be one space between it and the block before it.
-       val correctionSpace = if(childBlocks.firstOrNull() is SqlElConditionLoopCommentBlock){
-            0
-        }else 1
+        val correctionSpace =
+            if (isFirstChildConditionLoopDirective() ||
+                isParentConditionLoopDirective()
+            ) {
+                0
+            } else {
+                1
+            }
         val parentGroupIndent = parentBlock?.indent?.groupIndentLen ?: 0
         return getTotalTopKeywordLength().plus(parentGroupIndent).plus(correctionSpace)
     }

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

@@ -90,7 +90,7 @@ class SqlFunctionParamBlock(
             }
                 ?: emptyList()
         val parentText =
-            if (parentBlock is SqlElConditionLoopCommentBlock) {
+            if (isParentConditionLoopDirective()) {
                 val grand = parentBlock?.parentBlock
                 grand?.getNodeText() ?: ""
             } else {

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

@@ -37,7 +37,7 @@ class SqlEscapeBlock(
 
     override fun createBlockIndentLen(): Int {
         val parentEscapeBlock =
-            if (parentBlock is SqlElConditionLoopCommentBlock) {
+            if (isParentConditionLoopDirective()) {
                 if (parentBlock?.parentBlock is SqlEscapeBlock)1 else 0
             } else {
                 0