Fix indent calculation logic for combined IN clause and subquery

Author: xterao

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

@@ -40,7 +40,11 @@ class SqlInGroupBlock(
 
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
-            if (parent is SqlElConditionLoopCommentBlock) return parent.indent.groupIndentLen
+            if (parent is SqlElConditionLoopCommentBlock &&
+                parent.checkConditionLoopDirectiveParentBlock(this)
+            ) {
+                return parent.indent.indentLen
+            }
             val prevChildren = this.prevBlocks
             val children = prevChildren.filter { it !is SqlDefaultCommentBlock }
             val firstChild = children.firstOrNull()
@@ -52,13 +56,16 @@ class SqlInGroupBlock(
                 }
 
             val dotCount = sumChildren.count { it.node.elementType == SqlTypes.DOT }
+            val parentText = (parent as? SqlElConditionLoopCommentBlock)?.parentBlock?.getNodeText()?.length ?: 0
+
             return sumChildren
                 .sumOf { prev ->
                     prev
                         .getChildrenTextLen()
                         .plus(prev.getNodeText().length.plus(1))
                 }.minus(dotCount * 2)
                 .plus(parent.indent.groupIndentLen)
+                .plus(parentText)
                 .plus(1)
         }
         return 0

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

@@ -21,6 +21,7 @@ import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlDefaultCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlJoinGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.SqlConditionalExpressionGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlJoinQueriesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithCommonTableGroupBlock
@@ -65,7 +66,11 @@ open class SqlSubQueryGroupBlock(
                 is SqlJoinQueriesGroupBlock -> return parent.indent.indentLen
                 is SqlJoinGroupBlock -> return parent.indent.groupIndentLen.plus(1)
                 else -> {
-                    val children = prevChildren?.filter { it !is SqlDefaultCommentBlock }
+                    val children =
+                        prevChildren?.filter {
+                            it !is SqlDefaultCommentBlock &&
+                                (parent as? SqlKeywordGroupBlock)?.topKeywordBlocks?.contains(it) == false
+                        }
                     // Retrieve the list of child blocks excluding the conditional directive that appears immediately before this block,
                     // as it is already included as a child block.
                     val sumChildren =