Refactor indentation logic in SqlSubGroupBlock and SqlEscapeBlock, SqlArrayWordBlock for clarity

Author: xterao

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

@@ -109,16 +109,10 @@ abstract class SqlSubGroupBlock(
         return offset
     }
 
-    override fun createGroupIndentLen(): Int {
-        return parentBlock?.let { parent ->
+    override fun createGroupIndentLen(): Int =
+        parentBlock?.let { parent ->
             parent.indent.indentLen.plus(parent.getNodeText().length.plus(1))
         } ?: indent.indentLen.plus(getNodeText().length)
-//        parentBlock?.let { parent ->
-//            // The parent groupIndent includes the number of characters in the group itself.
-//            val baseGroupLen = parent.indent.groupIndentLen
-//            return if (parent is SqlSubGroupBlock) baseGroupLen.plus(2) else baseGroupLen
-//        } ?: return 1
-    }
 
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         lastGroup?.let { lastBlock ->

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

@@ -34,7 +34,8 @@ class SqlEscapeBlock(
     }
 
     override fun createBlockIndentLen(): Int {
-        isEndEscape = parentBlock?.childBlocks?.count { it is SqlEscapeBlock }?.let { it % 2 == 0 } == true || getNodeText() == "]"
+        val hasEvenEscapeBlocks = parentBlock?.childBlocks?.count { it is SqlEscapeBlock }?.let { it % 2 == 0 } == true
+        isEndEscape = hasEvenEscapeBlocks || getNodeText() == "]"
         return if (isEndEscape) {
             0
         } else {

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

@@ -48,7 +48,11 @@ open class SqlArrayWordBlock(
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun createBlockIndentLen(): Int = (parentBlock as? SqlElConditionLoopCommentBlock)?.indent?.groupIndentLen ?: 1
+    override fun createBlockIndentLen(): Int =
+        when (val parent = parentBlock) {
+            is SqlElConditionLoopCommentBlock -> parent.indent.groupIndentLen
+            else -> 1
+        }
 
     override fun createGroupIndentLen(): Int =
         parentBlock