Added indentation processing for CASE-END

Author: xterao

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

@@ -20,7 +20,6 @@ import com.intellij.formatting.Block
 import com.intellij.formatting.Spacing
 import com.intellij.psi.tree.IElementType
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
-import org.domaframework.doma.intellij.formatter.block.SqlCommaBlock
 import org.domaframework.doma.intellij.formatter.block.SqlRightPatternBlock
 import org.domaframework.doma.intellij.formatter.block.SqlWhitespaceBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlColumnDefinitionRawGroupBlock
@@ -66,7 +65,7 @@ class SqlCustomSpacingBuilder {
 
     fun getSpacingWithIndentComma(
         child1: SqlBlock?,
-        child2: SqlCommaBlock,
+        child2: SqlBlock,
     ): Spacing? {
         val indentLen: Int = child2.indent.indentLen
         when (child1) {
@@ -107,12 +106,12 @@ class SqlCustomSpacingBuilder {
         return null
     }
 
-    fun getSpacingColumnRaw(child: SqlColumnDefinitionRawGroupBlock): Spacing? {
+    fun getSpacingColumnDefinitionRaw(child: SqlColumnDefinitionRawGroupBlock): Spacing? {
         val indentLen = child.indent.indentLen
         return Spacing.createSpacing(indentLen, indentLen, 0, false, 0, 0)
     }
 
-    fun getSpacingColumnRowEndRight(child: SqlRightPatternBlock): Spacing? {
+    fun getSpacingColumnDefinitionRawEndRight(child: SqlRightPatternBlock): Spacing? {
         val indentLen = child.indent.indentLen
         return Spacing.createSpacing(indentLen, indentLen, 0, false, 0, 0)
     }
@@ -157,7 +156,7 @@ class SqlCustomSpacingBuilder {
             }
 
             IndentType.INLINE -> {
-                return Spacing.createSpacing(0, 0, 0, false, 0, 0)
+                return Spacing.createSpacing(1, 1, 0, false, 0, 0)
             }
 
             IndentType.INLINE_SECOND -> {

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

@@ -33,6 +33,7 @@ import org.domaframework.doma.intellij.formatter.block.expr.SqlElDotBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElSymbolBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlColumnDefinitionGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlColumnDefinitionRawGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.SqlColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlCreateKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlDataTypeParamBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlInlineGroupBlock
@@ -190,6 +191,26 @@ open class SqlBlock(
                 }
             }
 
+            is SqlColumnGroupBlock -> {
+                when (lastIndentLevel) {
+                    childBlock.indent.indentLevel -> {
+                        groupTopNodeIndexHistory.removeLast()
+                        setParentGroups(
+                            childBlock,
+                        ) { history ->
+                            return@setParentGroups latestGroupTopBlock.parentBlock
+                        }
+                    }
+                    else -> {
+                        setParentGroups(
+                            childBlock,
+                        ) { history ->
+                            return@setParentGroups history.last().second
+                        }
+                    }
+                }
+            }
+
             is SqlInlineGroupBlock -> {
                 // case-end
                 setParentGroups(
@@ -200,14 +221,36 @@ open class SqlBlock(
             }
 
             is SqlInlineSecondGroupBlock -> {
-                groupTopNodeIndexHistory.removeLast()
+                if (childBlock.isEndCase) {
+                    val inlineIndex =
+                        groupTopNodeIndexHistory.indexOfLast { it.second.indent.indentLevel == IndentType.INLINE }
+                    if (inlineIndex >= 0) {
+                        setParentGroups(
+                            childBlock,
+                        ) { history ->
+                            return@setParentGroups history[inlineIndex].second
+                        }
+                        groupTopNodeIndexHistory
+                            .subList(
+                                inlineIndex,
+                                groupTopNodeIndexHistory.size,
+                            ).clear()
+                    }
+                    return
+                }
+                if (lastIndentLevel == IndentType.INLINE_SECOND) {
+                    groupTopNodeIndexHistory.removeLast()
+                    setParentGroups(
+                        childBlock,
+                    ) { history ->
+                        return@setParentGroups latestGroupTopBlock.parentBlock
+                    }
+                    return
+                }
                 setParentGroups(
                     childBlock,
                 ) { history ->
-                    return@setParentGroups latestGroupTopBlock.parentBlock
-                }
-                if (childBlock.isEndCase) {
-                    groupTopNodeIndexHistory.removeLast()
+                    return@setParentGroups history.last().second
                 }
             }
 
@@ -333,7 +376,9 @@ open class SqlBlock(
                             spacingBuilder,
                         )
 
-                    else -> SqlCommaBlock(child, wrap, alignment, spacingBuilder)
+                    is SqlColumnGroupBlock -> SqlColumnGroupBlock(child, wrap, alignment, spacingBuilder)
+
+                    else -> SqlColumnGroupBlock(child, wrap, alignment, spacingBuilder)
                 }
             }
 
@@ -472,14 +517,14 @@ open class SqlBlock(
         }
 
         if (child2 is SqlColumnDefinitionRawGroupBlock) {
-            SqlCustomSpacingBuilder().getSpacingColumnRaw(child2)?.let { return it }
+            SqlCustomSpacingBuilder().getSpacingColumnDefinitionRaw(child2)?.let { return it }
         }
 
         if (child2 is SqlRightPatternBlock && child2.parentBlock is SqlColumnDefinitionGroupBlock) {
-            SqlCustomSpacingBuilder().getSpacingColumnRowEndRight(child2)?.let { return it }
+            SqlCustomSpacingBuilder().getSpacingColumnDefinitionRawEndRight(child2)?.let { return it }
         }
 
-        if (child1 is SqlBlock && child2 is SqlCommaBlock) {
+        if (child1 is SqlBlock && (child2 is SqlCommaBlock || child2 is SqlColumnGroupBlock)) {
             SqlCustomSpacingBuilder().getSpacingWithIndentComma(child1, child2)?.let { return it }
         }
 

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

@@ -49,8 +49,9 @@ class SqlColumnGroupBlock(
 
     override fun setParentGroupBlock(block: SqlBlock?) {
         super.setParentGroupBlock(block)
+        indent.indentLevel = IndentType.COLUMN
         indent.indentLen = createIndentLen()
-        indent.groupIndentLen = indent.indentLen
+        indent.groupIndentLen = if (isFirstColumnGroup) indent.indentLen else indent.indentLen.plus(1)
     }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()

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

@@ -57,8 +57,11 @@ open class SqlInlineSecondGroupBlock(
 
     private fun createIndentLen(): Int =
         parentBlock?.let {
-            it.indent.groupIndentLen
-                .plus(it.node.text.length)
-                .plus(1)
+            if (isEndCase) {
+                it.indent.indentLen
+            } else {
+                it.indent.groupIndentLen
+                    .plus(it.node.text.length)
+            }
         } ?: 1
 }

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

@@ -29,12 +29,20 @@ open class SqlJoinGroupBlock(
     wrap: Wrap?,
     alignment: Alignment?,
     spacingBuilder: SpacingBuilder,
-) : SqlNewGroupBlock(
+) : SqlKeywordGroupBlock(
         node,
+        IndentType.JOIN,
         wrap,
         alignment,
         spacingBuilder,
     ) {
+    override val indent =
+        ElementIndent(
+            IndentType.JOIN,
+            0,
+            0,
+        )
+
     override fun setParentGroupBlock(block: SqlBlock?) {
         super.setParentGroupBlock(block)
         indent.indentLevel = IndentType.JOIN