Enhance line-breaking and indentation behavior.

Author: xterao

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

@@ -82,7 +82,7 @@ open class SqlCommaBlock(
         super.setParentGroupBlock(lastGroup)
         indent.indentLevel = IndentType.COMMA
         indent.indentLen = createBlockIndentLen()
-        indent.groupIndentLen = indent.indentLen.plus(getNodeText().length)
+        indent.groupIndentLen = createGroupIndentLen()
     }
 
     override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
@@ -142,6 +142,8 @@ open class SqlCommaBlock(
         return 1
     }
 
+    override fun createGroupIndentLen(): Int = indent.indentLen.plus(1)
+
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         if (parentBlock is SqlConditionalExpressionGroupBlock) return false
         return TypeUtil.isExpectedClassType(EXPECTED_TYPES, parentBlock)

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

@@ -62,5 +62,5 @@ abstract class SqlCommentBlock(
         return 0
     }
 
-    override fun createGroupIndentLen(): Int = 0
+    override fun createGroupIndentLen(): Int = indent.indentLen
 }

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

@@ -70,6 +70,15 @@ class SqlElConditionLoopCommentBlock(
         fun isElse(): Boolean = this == ELSE
     }
 
+    companion object {
+        private val LINE_BREAK_PARENT_TYPES =
+            listOf(
+                SqlSubGroupBlock::class,
+                SqlColumnRawGroupBlock::class,
+                SqlElConditionLoopCommentBlock::class,
+            )
+    }
+
     var tempParentBlock: SqlBlock? = null
     val conditionType: SqlConditionLoopCommentBlockType = initConditionOrLoopType(node)
     var conditionStart: SqlElConditionLoopCommentBlock? = null
@@ -102,6 +111,13 @@ class SqlElConditionLoopCommentBlock(
      *
      * If the next element is a **[SqlKeywordGroupBlock]** or **[SqlSubGroupBlock]**, align the directive’s indentation to that keyword’s indentation.
      * Otherwise, use the **provisional indentation element as the base** to align the indentation of child elements under the directive.
+     *
+     * @note
+     * When a keyword group appears immediately before a conditional or loop directive, and a non-group block appears immediately after, the directive can end up being registered as a child of both.
+     *
+     * To ensure correct group block generation in the later sub-group block processing, the conditional/loop directive must remain registered as a child of the preceding keyword group.
+     * If it is not retained, the resulting group block structure will be inaccurate.
+     *
      */
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {
         super.setParentGroupBlock(lastGroup)
@@ -122,6 +138,12 @@ class SqlElConditionLoopCommentBlock(
         }
     }
 
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        if (lastGroup is SqlElConditionLoopCommentBlock && conditionType.isEnd()) {
+            lastGroup.conditionEnd = this
+        }
+    }
+
     override fun buildChildren(): MutableList<AbstractBlock> {
         val blocks = mutableListOf<AbstractBlock>()
         var child = node.firstChildNode
@@ -200,10 +222,10 @@ class SqlElConditionLoopCommentBlock(
         if (conditionType.isEnd() || conditionType.isElse()) {
             return true
         }
-        if (lastGroup is SqlSubGroupBlock) {
-            return lastGroup.childBlocks.dropLast(1).isNotEmpty()
+        if (TypeUtil.isExpectedClassType(LINE_BREAK_PARENT_TYPES, lastGroup)) {
+            return lastGroup?.childBlocks?.dropLast(1)?.isNotEmpty() == true || lastGroup is SqlElConditionLoopCommentBlock
         }
-        return true
+        return lastGroup?.childBlocks?.firstOrNull() != this
     }
 
     /**
@@ -243,7 +265,8 @@ class SqlElConditionLoopCommentBlock(
                     return if (TypeUtil.isExpectedClassType(
                             SqlRightPatternBlock.NOT_INDENT_EXPECTED_TYPES,
                             parent,
-                        )
+                        ) ||
+                        parent is SqlWithCommonTableGroupBlock
                     ) {
                         parentGroupIndentLen.plus(openConditionLoopDirectiveCount * 2)
                     } else {
@@ -262,6 +285,22 @@ class SqlElConditionLoopCommentBlock(
                         return parent.indent.indentLen.plus(2)
                     }
                 }
+
+                is SqlKeywordGroupBlock -> {
+                    // At this point, it's not possible to determine whether the parent keyword group appears before or after this block based solely on the parent-child relationship.
+                    // Therefore, determine the position directly using the text offset.
+                    return if (parent.node.startOffset <
+                        node.startOffset
+                    ) {
+                        // The child branch applies in cases where a conditional directive is included as a child of this block.
+                        val questOffset = if (parent is SqlWithQueryGroupBlock) 0 else 1
+                        parent.indent.groupIndentLen
+                            .plus(openConditionLoopDirectiveCount * 2)
+                            .plus(questOffset)
+                    } else {
+                        parent.indent.indentLen.plus(openConditionLoopDirectiveCount * 2)
+                    }
+                }
                 else -> return parent.indent.indentLen.plus(openConditionLoopDirectiveCount * 2)
             }
         }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/column/SqlColumnDefinitionRawGroupBlock.kt

@@ -32,7 +32,7 @@ open class SqlColumnDefinitionRawGroupBlock(
         node,
         context,
     ) {
-    // TODO:Customize indentation within an inline group
+    // TODO Customize indentation within an inline group
     open val defaultOffset = 0
     val isFirstColumnRaw = node.elementType != SqlTypes.COMMA
 

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

@@ -46,7 +46,7 @@ class SqlConditionKeywordGroupBlock(
         }
     }
 
-    // TODO　If AND appears after OR, change it so that it is right-justified.
+    // If AND appears after OR, change it so that it is right-justified.
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
             val groupLen = parent.indent.groupIndentLen

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

@@ -41,7 +41,7 @@ class SqlCreateTableColumnDefinitionGroupBlock(
         node,
         context,
     ) {
-    // TODO:Customize indentation
+    // TODO Customize indentation
     override val offset = 2
     private val groupOffset = 5
     val columnRawGroupBlocks = mutableListOf<SqlColumnDefinitionRawGroupBlock>()

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

@@ -37,7 +37,7 @@ class SqlInsertColumnGroupBlock(
         node,
         context,
     ) {
-    // TODO:Customize indentation
+    // TODO Customize indentation
     override val offset = 2
 
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {

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

@@ -41,6 +41,7 @@ abstract class SqlTopQueryGroupBlock(
                 SqlWithQuerySubGroupBlock::class,
                 SqlElConditionLoopCommentBlock::class,
             )
+        private val offset = 0
     }
 
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {
@@ -54,7 +55,10 @@ abstract class SqlTopQueryGroupBlock(
 
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
-            if (parent.indent.indentLevel == IndentType.FILE) return 0
+            if (parent.indent.indentLevel == IndentType.FILE) return offset
+            if (parent is SqlElConditionLoopCommentBlock) {
+                return createIndentLenInConditionLoopDirective(parent)
+            }
             var baseIndent = parent.indent.groupIndentLen
             if (!TypeUtil.isExpectedClassType(PARENT_INDENT_SYNC_TYPES, parent)) {
                 baseIndent = baseIndent.plus(1)
@@ -63,4 +67,36 @@ abstract class SqlTopQueryGroupBlock(
         }
         return 0
     }
+
+    protected fun createIndentLenInConditionLoopDirective(parent: SqlElConditionLoopCommentBlock): Int {
+        // When the parent is a conditional directive, adjust the indent considering loop nesting
+        val parentConditionLoopNests = mutableListOf<SqlBlock>()
+        var blockParent: SqlBlock? = parent
+        parentConditionLoopNests.add(parent)
+        while (blockParent is SqlElConditionLoopCommentBlock) {
+            blockParent = blockParent.parentBlock
+            if (blockParent != null) parentConditionLoopNests.add(blockParent)
+        }
+        val prevGroupBlock = parentConditionLoopNests.lastOrNull()
+        parentConditionLoopNests.dropLast(1).reversed().forEachIndexed { index, p ->
+            if (index == 0) {
+                // For the first conditional loop directive, if it has a parent block whose indent level is lower than itself,
+                // align with the indent of that parent's parent
+                prevGroupBlock?.let { prev ->
+                    if (prev.indent.indentLevel >= indent.indentLevel) {
+                        p.indent.indentLen = prev.parentBlock?.indent?.indentLen ?: offset
+                    }
+                }
+            } else {
+                // For subsequent conditional loop directives, adjust the indent by the nesting count * 2
+                p.indent.indentLen = p.parentBlock
+                    ?.indent
+                    ?.indentLen
+                    ?.plus(2) ?: (index * 2)
+            }
+            p.indent.groupIndentLen = p.indent.indentLen
+        }
+
+        return parent.indent.indentLen
+    }
 }

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

@@ -32,7 +32,7 @@ class SqlUpdateColumnGroupBlock(
         node,
         context,
     ) {
-    // TODO:Customize indentation
+    // TODO Customize indentation
     override val offset = 2
     val columnRawGroupBlocks: MutableList<SqlColumnRawGroupBlock> = mutableListOf()
 

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

@@ -121,6 +121,11 @@ abstract class SqlSubGroupBlock(
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         lastGroup?.let { lastBlock ->
             if (lastBlock is SqlJoinQueriesGroupBlock) return true
+            val prevBlock = prevChildren?.dropLast(1)?.lastOrNull()
+            if (prevBlock is SqlKeywordBlock) {
+                if (prevBlock.getNodeText() == "in") return false
+            }
+            if (lastGroup is SqlElConditionLoopCommentBlock) return true
             return TypeUtil.isExpectedClassType(NEW_LINE_EXPECTED_TYPES, lastBlock.parentBlock)
         }
         return false