Modify conditions to treat subgroups after WHERE as SqlConditionalExpressionGroupBlock and properly handle spacing when subqueries are present

xterao · xterao · commit 94197a15b486 · 2025-08-26T11:53:04.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
@@ -102,7 +102,9 @@ open class SqlBlock(
     protected fun isConditionLoopDirectiveRegisteredBeforeParent(): Boolean {
         val firstPrevBlock = (prevBlocks.lastOrNull() as? SqlElConditionLoopCommentBlock)
         parentBlock?.let { parent ->
-            return firstPrevBlock != null &&
+
+            return (childBlocks.firstOrNull() as? SqlElConditionLoopCommentBlock)?.isBeforeParentBlock() == true ||
+                firstPrevBlock != null &&
                 firstPrevBlock.conditionEnd != null &&
                 firstPrevBlock.node.startOffset > parent.node.startOffset
         }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlFileBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlFileBlock.kt
@@ -555,7 +555,19 @@ open class SqlFileBlock(
                     SqlCustomSpacingBuilder.nonSpacing
                 }
 
-                else -> SqlCustomSpacingBuilder.normalSpacing
+                is SqlSubGroupBlock -> {
+                    val includeSpaceRight = childBlock1.endPatternBlock?.isPreSpaceRight()
+
+                    if (includeSpaceRight == false) {
+                        SqlCustomSpacingBuilder.nonSpacing
+                    } else {
+                        SqlCustomSpacingBuilder.normalSpacing
+                    }
+                }
+
+                else -> {
+                    SqlCustomSpacingBuilder.normalSpacing
+                }
             }
         }
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlRightPatternBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlRightPatternBlock.kt
@@ -18,6 +18,7 @@ package org.domaframework.doma.intellij.formatter.block
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.common.util.TypeUtil.isExpectedClassType
+import org.domaframework.doma.intellij.formatter.block.comment.SqlCommentBlock
 import org.domaframework.doma.intellij.formatter.block.conflict.SqlConflictExpressionSubGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
@@ -26,6 +27,7 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlC
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertValueGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlValuesGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlTopQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateSetGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateValueGroupBlock
@@ -60,6 +62,9 @@ open class SqlRightPatternBlock(
     }
 
     private var preSpaceRight = false
+
+    fun isPreSpaceRight() = preSpaceRight
+
     var lineBreakAndSpacingType: LineBreakAndSpacingType = LineBreakAndSpacingType.NONE
 
     companion object {
@@ -77,7 +82,6 @@ open class SqlRightPatternBlock(
                 SqlInsertColumnGroupBlock::class,
                 SqlWithQuerySubGroupBlock::class,
                 SqlConflictExpressionSubGroupBlock::class,
-                SqlConditionalExpressionGroupBlock::class,
             )
 
         val NEW_LINE_EXPECTED_TYPES =
@@ -103,11 +107,21 @@ open class SqlRightPatternBlock(
      */
     private fun enableLastRight() {
         parentBlock?.let { parent ->
+            val isFirstChildQuery =
+                parent.childBlocks.firstOrNull {
+                    it !is SqlCommentBlock
+                } is SqlTopQueryGroupBlock
             // Check if parent is in the notInsertSpaceClassList
             if (isExpectedClassType(NOT_INDENT_EXPECTED_TYPES, parent)) {
                 preSpaceRight = false
                 return
             }
+
+            if (parent is SqlConditionalExpressionGroupBlock) {
+                preSpaceRight = isFirstChildQuery
+                return
+            }
+
             if (isExpectedClassType(
                     INDENT_EXPECTED_TYPES,
                     parent,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElBlockCommentBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElBlockCommentBlock.kt
@@ -27,6 +27,7 @@ import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElFieldAccessBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElFunctionCallBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElStaticFieldAccessBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlValuesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithQuerySubGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubQueryGroupBlock
@@ -168,6 +169,7 @@ open class SqlElBlockCommentBlock(
                     }
                 }
                 is SqlValuesGroupBlock -> parent.indent.indentLen
+                is SqlKeywordGroupBlock -> parent.indent.groupIndentLen.plus(1)
                 else -> parent.indent.groupIndentLen
             }
         }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElConditionLoopCommentBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlElConditionLoopCommentBlock.kt
@@ -28,6 +28,7 @@ import org.domaframework.doma.intellij.formatter.block.SqlRightPatternBlock
 import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock
 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.SqlInsertQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithCommonTableGroupBlock
@@ -217,9 +218,9 @@ class SqlElConditionLoopCommentBlock(
                             return lastBlock.indent.indentLen
                         }
                     }
-                    return parent.indent.groupIndentLen +
-                        openConditionLoopDirectiveCount * DIRECTIVE_INDENT_STEP +
-                        if (parent !is SqlWithQueryGroupBlock) 1 else 0
+                    val withQuerySpace = if (parent !is SqlWithQueryGroupBlock) 1 else 0
+                    return parent.indent.groupIndentLen.plus(withQuerySpace) +
+                        openConditionLoopDirectiveCount * DIRECTIVE_INDENT_STEP
                 }
                 else -> return parent.indent.indentLen + openConditionLoopDirectiveCount * DIRECTIVE_INDENT_STEP
             }
@@ -302,5 +303,6 @@ class SqlElConditionLoopCommentBlock(
 
     private fun shouldNotIndent(parent: SqlSubGroupBlock): Boolean =
         TypeUtil.isExpectedClassType(SqlRightPatternBlock.NOT_INDENT_EXPECTED_TYPES, parent) ||
-            parent is SqlWithCommonTableGroupBlock
+            parent is SqlWithCommonTableGroupBlock ||
+            parent is SqlConditionalExpressionGroupBlock
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionalExpressionGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionalExpressionGroupBlock.kt
@@ -49,7 +49,18 @@ class SqlConditionalExpressionGroupBlock(
     override fun createBlockIndentLen(): Int =
         parentBlock?.let { parent ->
             if (parent is SqlElConditionLoopCommentBlock) {
-                parent.indent.groupIndentLen
+                val groupIndentLen = parent.indent.groupIndentLen
+                val grand = parent.parentBlock
+                val directiveParentTextLen =
+                    if (grand !is SqlElConditionLoopCommentBlock) {
+                        grand
+                            ?.getNodeText()
+                            ?.length
+                            ?.plus(1) ?: 0
+                    } else {
+                        0
+                    }
+                groupIndentLen + directiveParentTextLen
             } else {
                 parent.indent.groupIndentLen.plus(1)
             }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/handler/NotQueryGroupHandler.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/handler/NotQueryGroupHandler.kt
@@ -26,6 +26,7 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.S
 import org.domaframework.doma.intellij.formatter.block.group.keyword.option.SqlInGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlReturningGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlValuesGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlWhereGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlFunctionParamBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlParallelListBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlValuesParamGroupBlock
@@ -55,7 +56,9 @@ object NotQueryGroupHandler {
             else -> null
         }
 
-    private fun lastGroupParentConditionKeywordGroup(lastGroup: SqlBlock?): Boolean = lastGroup is SqlConditionKeywordGroupBlock
+    private fun lastGroupParentConditionKeywordGroup(lastGroup: SqlBlock?): Boolean =
+        lastGroup is SqlConditionKeywordGroupBlock ||
+            lastGroup is SqlWhereGroupBlock
 
     /**
      * Creates a keyword group block for specific keywords.

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,19 @@ open class SqlFileBlock(`
`555`	`555`	`SqlCustomSpacingBuilder.nonSpacing`
`556`	`556`	`}`
`557`	`557`
`558`		`- else -> SqlCustomSpacingBuilder.normalSpacing`
	`558`	`+ is SqlSubGroupBlock -> {`
	`559`	`+ val includeSpaceRight = childBlock1.endPatternBlock?.isPreSpaceRight()`
	`560`	`+`
	`561`	`+ if (includeSpaceRight == false) {`
	`562`	`+ SqlCustomSpacingBuilder.nonSpacing`
	`563`	`+ } else {`
	`564`	`+ SqlCustomSpacingBuilder.normalSpacing`
	`565`	`+ }`
	`566`	`+ }`
	`567`	`+`
	`568`	`+ else -> {`
	`569`	`+ SqlCustomSpacingBuilder.normalSpacing`
	`570`	`+ }`
`559`	`571`	`}`
`560`	`572`	`}`
`561`	`573`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock`
`27`	`27`	`import org.domaframework.doma.intellij.formatter.block.expr.SqlElFieldAccessBlock`
`28`	`28`	`import org.domaframework.doma.intellij.formatter.block.expr.SqlElFunctionCallBlock`
`29`	`29`	`import org.domaframework.doma.intellij.formatter.block.expr.SqlElStaticFieldAccessBlock`
	`30`	`+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock`
`30`	`31`	`import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlValuesGroupBlock`
`31`	`32`	`import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithQuerySubGroupBlock`
`32`	`33`	`import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubQueryGroupBlock`
`@@ -168,6 +169,7 @@ open class SqlElBlockCommentBlock(`
`168`	`169`	`}`
`169`	`170`	`}`
`170`	`171`	`is SqlValuesGroupBlock -> parent.indent.indentLen`
	`172`	`+ is SqlKeywordGroupBlock -> parent.indent.groupIndentLen.plus(1)`
`171`	`173`	`else -> parent.indent.groupIndentLen`
`172`	`174`	`}`
`173`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import org.domaframework.doma.intellij.formatter.block.SqlRightPatternBlock`
`28`	`28`	`import org.domaframework.doma.intellij.formatter.block.SqlUnknownBlock`
`29`	`29`	`import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnRawGroupBlock`
`30`	`30`	`import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock`
	`31`	`+import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.SqlConditionalExpressionGroupBlock`
`31`	`32`	`import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateKeywordGroupBlock`
`32`	`33`	`import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertQueryGroupBlock`
`33`	`34`	`import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithCommonTableGroupBlock`
`@@ -217,9 +218,9 @@ class SqlElConditionLoopCommentBlock(`
`217`	`218`	`return lastBlock.indent.indentLen`
`218`	`219`	`}`
`219`	`220`	`}`
`220`		`- return parent.indent.groupIndentLen +`
`221`		`- openConditionLoopDirectiveCount * DIRECTIVE_INDENT_STEP +`
`222`		`- if (parent !is SqlWithQueryGroupBlock) 1 else 0`
	`221`	`+ val withQuerySpace = if (parent !is SqlWithQueryGroupBlock) 1 else 0`
	`222`	`+ return parent.indent.groupIndentLen.plus(withQuerySpace) +`
	`223`	`+ openConditionLoopDirectiveCount * DIRECTIVE_INDENT_STEP`
`223`	`224`	`}`
`224`	`225`	`else -> return parent.indent.indentLen + openConditionLoopDirectiveCount * DIRECTIVE_INDENT_STEP`
`225`	`226`	`}`
`@@ -302,5 +303,6 @@ class SqlElConditionLoopCommentBlock(`
`302`	`303`
`303`	`304`	`private fun shouldNotIndent(parent: SqlSubGroupBlock): Boolean =`
`304`	`305`	`TypeUtil.isExpectedClassType(SqlRightPatternBlock.NOT_INDENT_EXPECTED_TYPES, parent) \|\|`
`305`		`- parent is SqlWithCommonTableGroupBlock`
	`306`	`+ parent is SqlWithCommonTableGroupBlock \|\|`
	`307`	`+ parent is SqlConditionalExpressionGroupBlock`
`306`	`308`	`}`