Refactor indentation logic and streamline expected types in SQL block classes

Author: xterao

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

@@ -49,6 +49,20 @@ open class SqlCommaBlock(
         context.enableFormat,
         context.formatMode,
     ) {
+    companion object {
+        private val expectedTypes =
+            listOf(
+                SqlInsertColumnGroupBlock::class,
+                SqlInsertValueGroupBlock::class,
+                SqlUpdateSetGroupBlock::class,
+                SqlUpdateColumnGroupBlock::class,
+                SqlUpdateValueGroupBlock::class,
+                SqlFunctionParamBlock::class,
+                SqlWithColumnGroupBlock::class,
+                SqlKeywordGroupBlock::class,
+            )
+    }
+
     override val indent =
         ElementIndent(
             IndentType.COMMA,
@@ -126,23 +140,7 @@ open class SqlCommaBlock(
     }
 
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
-        val excludeTypes =
-            listOf(
-                SqlConditionalExpressionGroupBlock::class,
-            )
-        if (TypeUtil.isExpectedClassType(excludeTypes, parentBlock)) return false
-
-        val expectedTypes =
-            listOf(
-                SqlInsertColumnGroupBlock::class,
-                SqlInsertValueGroupBlock::class,
-                SqlUpdateSetGroupBlock::class,
-                SqlUpdateColumnGroupBlock::class,
-                SqlUpdateValueGroupBlock::class,
-                SqlFunctionParamBlock::class,
-                SqlWithColumnGroupBlock::class,
-                SqlKeywordGroupBlock::class,
-            )
+        if (parentBlock is SqlConditionalExpressionGroupBlock) return false
         return TypeUtil.isExpectedClassType(expectedTypes, parentBlock)
     }
 }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/inline/SqlInlineSecondGroupBlock.kt

@@ -55,8 +55,8 @@ open class SqlInlineSecondGroupBlock(
         parentBlock?.let { parent ->
             // TODO:Customize indentation within an inline group
             if (isEndCase) {
-                val diff = parent.getNodeText().length.minus(getNodeText().length)
-                parent.indent.indentLen.plus(diff)
+                val diffTextLength = parent.getNodeText().length.minus(getNodeText().length)
+                parent.indent.indentLen.plus(diffTextLength)
             } else {
                 parent.indent.groupIndentLen.plus(1)
             }