Update IN clause indentation calculation to consider preceding block strings and conditional loop directives

Author: xterao

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

@@ -360,8 +360,19 @@ open class SqlBlock(
     protected fun calculatePrevBlocksLength(
         children: List<SqlBlock>,
         parent: SqlBlock,
-    ): Int =
-        children
+    ): Int {
+        // Add the parent's text length to the indentation if the parent is a conditional loop directive.
+        val directiveParentIndent =
+            if (parent is SqlElConditionLoopCommentBlock) {
+                parent.parentBlock
+                    ?.getNodeText()
+                    ?.length ?: 0
+            } else {
+                0
+            }
+
+        return children
+            .filter { it !is SqlDefaultCommentBlock && it !is SqlElConditionLoopCommentBlock }
             .sumOf { prev ->
                 prev
                     .getChildrenTextLen()
@@ -375,6 +386,8 @@ open class SqlBlock(
                         },
                     )
             }.plus(parent.indent.groupIndentLen)
+            .plus(directiveParentIndent)
+    }
 
     /**
      * Returns the child indentation for the block.

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

@@ -17,12 +17,10 @@ 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.SqlDefaultCommentBlock
 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.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
-import org.domaframework.doma.intellij.psi.SqlTypes
 
 class SqlInGroupBlock(
     node: ASTNode,
@@ -45,20 +43,7 @@ class SqlInGroupBlock(
             ) {
                 return parent.indent.indentLen
             }
-            val prevChildren = this.prevBlocks
-            val children = prevChildren.filter { it !is SqlDefaultCommentBlock }
-            val firstChild = children.firstOrNull()
-            val sumChildren =
-                if (firstChild is SqlElConditionLoopCommentBlock) {
-                    children.drop(1).dropLastWhile { it == this }
-                } else {
-                    children
-                }
-
-            val dotCount = sumChildren.count { it.node.elementType == SqlTypes.DOT }
-            val parentText = prevChildren.dropLast(1).filter { it !is SqlDefaultCommentBlock }
-
-            return calculatePrevBlocksLength(parentText, parent)
+            return calculatePrevBlocksLength(prevBlocks, parent).plus(1)
         }
         return 0
     }