Refactor inline group block classes and update package structure for better organization

xterao · xterao · commit 3c4aa79b2f48 · 2025-07-11T17:02:52.000+09:00
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlBlock.kt
@@ -36,9 +36,9 @@ import org.domaframework.doma.intellij.formatter.block.group.SqlNewGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnRawGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateColumnAssignmentSymbolBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateSetGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithColumnGroupBlock
@@ -257,8 +257,6 @@ open class SqlBlock(
 
             is SqlInlineSecondGroupBlock -> {
                 parentSetProcessor.updateInlineSecondGroupBlockParentAndAddGroup(
-                    lastGroupBlock,
-                    lastIndentLevel,
                     childBlock,
                 )
             }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlCommaBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlCommaBlock.kt
@@ -20,6 +20,7 @@ import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.common.util.TypeUtil
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.SqlConditionalExpressionGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertValueGroupBlock
@@ -125,6 +126,12 @@ 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,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/inline/SqlInlineGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/inline/SqlInlineGroupBlock.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.domaframework.doma.intellij.formatter.block.group.keyword
+package org.domaframework.doma.intellij.formatter.block.group.keyword.inline
 
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
@@ -29,6 +29,8 @@ open class SqlInlineGroupBlock(
         node,
         context,
     ) {
+    val inlineConditions: MutableList<SqlInlineSecondGroupBlock> = mutableListOf()
+
     override val indent =
         ElementIndent(
             IndentType.INLINE,
@@ -40,15 +42,12 @@ open class SqlInlineGroupBlock(
         super.setParentGroupBlock(lastGroup)
         indent.indentLevel = IndentType.INLINE
         indent.indentLen = createBlockIndentLen()
-        indent.groupIndentLen = indent.indentLen.plus(getNodeText().length)
+        indent.groupIndentLen = createGroupIndentLen()
     }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
-    override fun createBlockIndentLen(): Int =
-        parentBlock?.let {
-            it.indent.groupIndentLen
-                .plus(it.getNodeText().length)
-                .plus(1)
-        } ?: 1
+    override fun createBlockIndentLen(): Int = parentBlock?.indent?.groupIndentLen?.plus(1) ?: 1
+
+    override fun createGroupIndentLen(): Int = indent.indentLen.plus(getNodeText().length)
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/inline/SqlInlineSecondGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/inline/SqlInlineSecondGroupBlock.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.domaframework.doma.intellij.formatter.block.group.keyword
+package org.domaframework.doma.intellij.formatter.block.group.keyword.inline
 
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
@@ -29,7 +29,7 @@ open class SqlInlineSecondGroupBlock(
         node,
         context,
     ) {
-    val isEndCase = getNodeText().lowercase() == "end"
+    val isEndCase = getNodeText() == "end"
 
     override val indent =
         ElementIndent(
@@ -42,19 +42,28 @@ open class SqlInlineSecondGroupBlock(
         super.setParentGroupBlock(lastGroup)
         indent.indentLevel = IndentType.INLINE_SECOND
         indent.indentLen = createBlockIndentLen()
-        indent.groupIndentLen = indent.indentLen
+        indent.groupIndentLen = createGroupIndentLen()
+    }
+
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlInlineGroupBlock)?.inlineConditions?.add(this)
     }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
     override fun createBlockIndentLen(): Int =
-        parentBlock?.let {
+        parentBlock?.let { parent ->
             // TODO:Customize indentation within an inline group
             if (isEndCase) {
-                it.indent.indentLen
+                val diff = parent.getNodeText().length.minus(getNodeText().length)
+                parent.indent.indentLen.plus(diff)
             } else {
-                it.indent.groupIndentLen
-                    .plus(it.getNodeText().length)
+                parent.indent.groupIndentLen.plus(1)
             }
         } ?: 1
+
+    override fun createGroupIndentLen(): Int = indent.indentLen.plus(getNodeText().length)
+
+    override fun isSaveSpace(lastGroup: SqlBlock?): Boolean =
+        (parentBlock as? SqlInlineGroupBlock)?.inlineConditions?.dropLast(1)?.isEmpty() != true
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlSetParentGroupProcessor.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlSetParentGroupProcessor.kt
@@ -24,11 +24,11 @@ import org.domaframework.doma.intellij.formatter.block.conflict.SqlDoGroupBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnRawGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlLateralGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateViewGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlReturningGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlTopQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateQueryGroupBlock
@@ -251,11 +251,7 @@ class SqlSetParentGroupProcessor(
         }
     }
 
-    fun updateInlineSecondGroupBlockParentAndAddGroup(
-        lastGroupBlock: SqlBlock,
-        lastIndentLevel: IndentType,
-        childBlock: SqlInlineSecondGroupBlock,
-    ) {
+    fun updateInlineSecondGroupBlockParentAndAddGroup(childBlock: SqlInlineSecondGroupBlock) {
         val context =
             SetParentContext(
                 childBlock,
@@ -276,13 +272,12 @@ class SqlSetParentGroupProcessor(
             }
             return
         }
-        if (lastIndentLevel == IndentType.INLINE_SECOND) {
-            blockBuilder.removeLastGroupTopNodeIndexHistory()
-            updateGroupBlockLastGroupParentAddGroup(
-                lastGroupBlock,
-                childBlock,
-            )
-            return
+        val inlineSecondIndex =
+            blockBuilder.getGroupTopNodeIndex { block ->
+                block.indent.indentLevel == IndentType.INLINE_SECOND
+            }
+        if (inlineSecondIndex >= 0) {
+            blockBuilder.clearSubListGroupTopNodeIndexHistory(inlineSecondIndex)
         }
         updateGroupBlockParentAndAddGroup(
             childBlock,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockUtil.kt
@@ -36,8 +36,6 @@ import org.domaframework.doma.intellij.formatter.block.expr.SqlElConditionLoopCo
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnRawGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlJoinGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlLateralGroupBlock
@@ -47,6 +45,8 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlC
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateTableColumnDefinitionGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateTableColumnDefinitionRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateViewGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlFromGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlSecondKeywordBlock
@@ -244,8 +244,11 @@ class SqlBlockUtil(
                             )
                         } else {
                             WithClauseUtil
-                                .getWithClauseKeywordGroup(lastGroupBlock, child, sqlBlockFormattingCtx)
-                                ?.let { return it }
+                                .getWithClauseKeywordGroup(
+                                    lastGroupBlock,
+                                    child,
+                                    sqlBlockFormattingCtx,
+                                )?.let { return it }
                             return SqlSecondKeywordBlock(
                                 child,
                                 sqlBlockFormattingCtx,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlKeywordUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlKeywordUtil.kt
@@ -24,18 +24,18 @@ enum class IndentType(
     TOP(1, true),
     SECOND(2, true),
     JOIN(3, true),
+    INLINE(2),
+    INLINE_SECOND(3, true),
     SECOND_OPTION(4, true),
     TIRD(5),
     ATTACHED(6),
-    INLINE_SECOND(8, true),
-    COLUMN(9, true),
+    COLUMN(7, true),
     SUB(90),
     ATTRIBUTE(91),
     LITERAL(92),
     COMMA(93),
     OPTIONS(94),
     PARAM(95),
-    INLINE(96),
     NONE(99),
     ;
 
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt
@@ -54,6 +54,10 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("Select.sql", "Select$formatDataPrefix.sql")
     }
 
+    fun testSelectCaseEndFormatter() {
+        formatSqlFile("SelectCaseEnd.sql", "SelectCaseEnd$formatDataPrefix.sql")
+    }
+
     fun testSelectFromLateralFormatter() {
         formatSqlFile("SelectFromLateral.sql", "SelectFromLateral$formatDataPrefix.sql")
     }
diff --git a/src/test/testData/sql/formatter/SelectCaseEnd.sql b/src/test/testData/sql/formatter/SelectCaseEnd.sql
@@ -0,0 +1,4 @@
+Select case when div = 'A' then 'AAA'
+when div = 'B' then 'BBB'
+else 'CCC' end as divName
+from users
diff --git a/src/test/testData/sql/formatter/SelectCaseEnd_format.sql b/src/test/testData/sql/formatter/SelectCaseEnd_format.sql
@@ -0,0 +1,5 @@
+SELECT CASE WHEN div = 'A' THEN 'AAA'
+            WHEN div = 'B' THEN 'BBB'
+            ELSE 'CCC'
+        END AS divName
+  FROM users 

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ class SqlFormatterTest : BasePlatformTestCase() {`
`54`	`54`	`formatSqlFile("Select.sql", "Select$formatDataPrefix.sql")`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ fun testSelectCaseEndFormatter() {`
	`58`	`+ formatSqlFile("SelectCaseEnd.sql", "SelectCaseEnd$formatDataPrefix.sql")`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`fun testSelectFromLateralFormatter() {`
`58`	`62`	`formatSqlFile("SelectFromLateral.sql", "SelectFromLateral$formatDataPrefix.sql")`
`59`	`63`	`}`