Refactor the logic for retrieving child block lists into a separate function.

Author: xterao

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

@@ -89,6 +89,8 @@ open class SqlBlock(
     open var parentBlock: SqlBlock? = null
     open val childBlocks = mutableListOf<SqlBlock>()
 
+    fun getChildBlocksDropLast(dropIndex: Int = 1): List<SqlBlock> = childBlocks.dropLast(dropIndex)
+
     open val indent: ElementIndent =
         ElementIndent(
             IndentType.FILE,

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

@@ -41,7 +41,7 @@ open class SqlLineCommentBlock(
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
             if (parent is SqlSubQueryGroupBlock) {
-                if (parent.childBlocks.dropLast(1).isEmpty()) {
+                if (parent.getChildBlocksDropLast().isEmpty()) {
                     return 0
                 }
                 if (parent.isFirstLineComment) {

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

@@ -130,7 +130,7 @@ open class SqlElBlockCommentBlock(
     override fun createBlockIndentLen(): Int {
         parentBlock?.let {
             if (it is SqlSubQueryGroupBlock) {
-                if (it.childBlocks.dropLast(1).isEmpty()) {
+                if (it.getChildBlocksDropLast().isEmpty()) {
                     return 0
                 }
                 if (it.isFirstLineComment) {

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

@@ -65,7 +65,7 @@ class SqlSelectQueryGroupBlock(
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         lastGroup?.let { lastBlock ->
             if (lastGroup is SqlWithQuerySubGroupBlock) return true
-            if (lastBlock is SqlSubGroupBlock) return lastBlock.childBlocks.dropLast(1).isNotEmpty()
+            if (lastBlock is SqlSubGroupBlock) return lastBlock.getChildBlocksDropLast().isNotEmpty()
         }
         return true
     }

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

@@ -56,7 +56,7 @@ class SqlWithCommonTableGroupBlock(
     private fun findWithQueryChildBlocks(): SqlBlock? {
         parentBlock?.let { parent ->
             if (parent is SqlWithQueryGroupBlock) {
-                return parent.childBlocks.dropLast(1).find { it is SqlWithCommonTableGroupBlock }
+                return parent.getChildBlocksDropLast().find { it is SqlWithCommonTableGroupBlock }
             }
         }
         return null
@@ -75,7 +75,7 @@ class SqlWithCommonTableGroupBlock(
 
     override fun createGroupIndentLen(): Int {
         parentBlock?.let { parent ->
-            childBlocks.dropLast(1).sumOf { it.getNodeText().length.plus(1) }
+            getChildBlocksDropLast().sumOf { it.getNodeText().length.plus(1) }
         }
         return offset
     }

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

@@ -16,6 +16,8 @@
 package org.domaframework.doma.intellij.formatter.block.group.subgroup
 
 import com.intellij.lang.ASTNode
+import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
+import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
@@ -41,8 +43,9 @@ class SqlParallelListBlock(
 
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
-            return parent.childBlocks
-                .dropLast(1)
+            return parent
+                .getChildBlocksDropLast()
+                .filter { it !is SqlLineCommentBlock && it !is SqlBlockCommentBlock }
                 .sumOf { it.getNodeText().length.plus(1) }
                 .plus(parent.indent.indentLen)
                 .plus(parent.getNodeText().length)

src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlCustomSpacingBuilder.kt

@@ -132,7 +132,7 @@ class SqlCustomSpacingBuilder {
             }
 
             paramBlock is SqlParallelListBlock -> {
-                val lastKeywordGroup = paramBlock.childBlocks.dropLast(1).lastOrNull()
+                val lastKeywordGroup = paramBlock.getChildBlocksDropLast().lastOrNull()
                 return if (lastKeywordGroup is SqlKeywordGroupBlock) {
                     normalSpacing
                 } else {

src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt

@@ -90,10 +90,6 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("UpdateTupleAssignment.sql", "UpdateTupleAssignment$formatDataPrefix.sql")
     }
 
-    fun testUpdateTupleAssignmentSubQueryFormatter() {
-        formatSqlFile("UpdateTupleAssignmentSubQuery.sql", "UpdateTupleAssignmentSubQuery$formatDataPrefix.sql")
-    }
-
     fun testUpdateTupleSubUseQueryRowFormatter() {
         formatSqlFile("UpdateTupleSubUseQueryRow.sql", "UpdateTupleSubUseQueryRow$formatDataPrefix.sql")
     }