Implemented an override method to set child block properties into the parent block accordingly.

xterao · xterao · commit 32472553903f · 2025-07-01T11:37:39.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
@@ -43,14 +43,14 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineSe
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateTableColumnDefinitionGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertColumnGroupBlock
+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.subgroup.SqlColumnRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlDataTypeParamBlock
 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.SqlRightPatternBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubQueryGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlUpdateColumnAssignmentSymbolBlock
 import org.domaframework.doma.intellij.formatter.builder.SqlBlockBuilder
 import org.domaframework.doma.intellij.formatter.builder.SqlCustomSpacingBuilder
 import org.domaframework.doma.intellij.formatter.processor.SqlSetParentGroupProcessor
@@ -109,8 +109,11 @@ open class SqlBlock(
     open fun setParentGroupBlock(lastGroup: SqlBlock?) {
         parentBlock = lastGroup
         parentBlock?.addChildBlock(this)
+        setParentPropertyBlock(lastGroup)
     }
 
+    open fun setParentPropertyBlock(lastGroup: SqlBlock?) {}
+
     open val isNeedWhiteSpace: Boolean = true
 
     open fun addChildBlock(childBlock: SqlBlock) {
@@ -414,7 +417,9 @@ open class SqlBlock(
                 return blockUtil.getSubGroupBlock(lastGroup, child)
             }
 
-            SqlTypes.OTHER -> return if (lastGroup is SqlUpdateSetGroupBlock) {
+            SqlTypes.OTHER -> return if (lastGroup is SqlUpdateSetGroupBlock &&
+                lastGroup.columnDefinitionGroupBlock != null
+            ) {
                 SqlUpdateColumnAssignmentSymbolBlock(child, defaultFormatCtx)
             } else {
                 SqlOtherBlock(
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlColumnBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlColumnBlock.kt
@@ -45,9 +45,9 @@ class SqlColumnBlock(
         indent.groupIndentLen = 0
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        (lastGroup as? SqlColumnDefinitionRawGroupBlock)?.columnBlock = this
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlColumnDefinitionRawGroupBlock)?.columnBlock = this
+    }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlTableBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlTableBlock.kt
@@ -17,6 +17,8 @@ package org.domaframework.doma.intellij.formatter.block
 
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.util.CreateQueryType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
 class SqlTableBlock(
@@ -32,11 +34,11 @@ class SqlTableBlock(
         super.setParentGroupBlock(lastGroup)
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        if (lastGroup is SqlCreateKeywordGroupBlock && lastGroup.createType == CreateQueryType.TABLE) {
-//            lastGroup.tableBlock = this
-//        }
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        if (lastGroup is SqlCreateKeywordGroupBlock && lastGroup.createType == CreateQueryType.TABLE) {
+            lastGroup.tableBlock = this
+        }
+    }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlKeywordGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlKeywordGroupBlock.kt
@@ -21,6 +21,7 @@ import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlNewGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateViewGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubQueryGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
@@ -50,17 +51,17 @@ open class SqlKeywordGroupBlock(
         createGroupIndentLen()
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        if (lastGroup is SqlSelectKeywordGroupBlock &&
-//            SqlKeywordUtil.isSelectSecondOptionKeyword(getNodeText())
-//        ) {
-//            lastGroup.secondGroupBlocks.add(this)
-//        }
-//
-//        if (getNodeText() == "values" && lastGroup is SqlInsertQueryGroupBlock) {
-//            lastGroup.valueKeywordBlock = this
-//        }
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        if (lastGroup is SqlSelectKeywordGroupBlock &&
+            SqlKeywordUtil.isSelectSecondOptionKeyword(getNodeText())
+        ) {
+            lastGroup.secondGroupBlocks.add(this)
+        }
+
+        if (getNodeText() == "values" && lastGroup is SqlInsertQueryGroupBlock) {
+            lastGroup.valueKeywordBlock = this
+        }
+    }
 
     open fun getBaseIndentLen(
         preChildBlock: SqlBlock?,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlSelectKeywordGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/SqlSelectKeywordGroupBlock.kt
@@ -25,7 +25,7 @@ class SqlSelectKeywordGroupBlock(
     node: ASTNode,
     context: SqlBlockFormattingContext,
 ) : SqlKeywordGroupBlock(node, IndentType.TOP, context) {
-    // val secondGroupBlocks: MutableList<SqlKeywordGroupBlock> = mutableListOf()
+    val secondGroupBlocks: MutableList<SqlKeywordGroupBlock> = mutableListOf()
     val selectionColumns: MutableList<SqlBlock> = mutableListOf()
 
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/create/SqlCreateTableColumnDefinitionRawGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/create/SqlCreateTableColumnDefinitionRawGroupBlock.kt
@@ -55,13 +55,13 @@ class SqlCreateTableColumnDefinitionRawGroupBlock(
         indent.groupIndentLen = indent.indentLen
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        (lastGroup as? SqlCreateTableColumnDefinitionGroupBlock)
-//            ?.columnRawGroupBlocks
-//            ?.add(
-//                this,
-//            )
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlCreateTableColumnDefinitionGroupBlock)
+            ?.columnRawGroupBlocks
+            ?.add(
+                this,
+            )
+    }
 
     override fun createBlockIndentLen(): Int =
         (parentBlock as? SqlCreateTableColumnDefinitionGroupBlock)
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/insert/SqlInsertColumnGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/insert/SqlInsertColumnGroupBlock.kt
@@ -57,9 +57,9 @@ class SqlInsertColumnGroupBlock(
         updateParentGroupIndentLen()
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        (lastGroup as? SqlInsertQueryGroupBlock)?.columnDefinitionGroupBlock = this
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlInsertQueryGroupBlock)?.columnDefinitionGroupBlock = this
+    }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateColumnAssignmentSymbolBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateColumnAssignmentSymbolBlock.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.subgroup
+package org.domaframework.doma.intellij.formatter.block.group.keyword.update
 
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
@@ -35,9 +35,11 @@ class SqlUpdateColumnAssignmentSymbolBlock(
         indent.groupIndentLen = indent.groupIndentLen.plus(1)
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        (lastGroup as? SqlUpdateSetGroupBlock)?.assignmentSymbol = this
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        if (lastGroup is SqlUpdateSetGroupBlock && lastGroup.columnDefinitionGroupBlock != null) {
+            lastGroup.assignmentSymbol = this
+        }
+    }
 
     private fun createIndentLen(): Int {
         parentBlock?.let { parent -> return parent.indent.groupIndentLen.plus(1) }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateColumnGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateColumnGroupBlock.kt
@@ -43,9 +43,9 @@ class SqlUpdateColumnGroupBlock(
         updateParentGroupIndentLen()
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        (lastGroup as? SqlUpdateSetGroupBlock)?.columnDefinitionGroupBlock = this
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlUpdateSetGroupBlock)?.columnDefinitionGroupBlock = this
+    }
 
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateSetGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateSetGroupBlock.kt
@@ -20,7 +20,6 @@ import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlUpdateColumnAssignmentSymbolBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlUpdateValueGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
@@ -48,9 +47,9 @@ open class SqlUpdateSetGroupBlock(
         indent.groupIndentLen = indent.indentLen.plus(getNodeText().length)
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        (lastGroup as? SqlUpdateQueryGroupBlock)?.setQueryGroupBlock = this
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlUpdateQueryGroupBlock)?.setQueryGroupBlock = this
+    }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlColumnRawGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlColumnRawGroupBlock.kt
@@ -19,6 +19,8 @@ import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlSelectKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
@@ -46,13 +48,13 @@ class SqlColumnRawGroupBlock(
             if (isFirstColumnGroup) indent.indentLen else indent.indentLen.plus(1)
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        when (lastGroup) {
-//            is SqlSelectKeywordGroupBlock -> lastGroup.selectionColumns.add(this)
-//            is SqlUpdateColumnGroupBlock -> lastGroup.columnRawGroupBlocks.add(this)
-//        }
-//        (lastGroup as? SqlSelectKeywordGroupBlock)?.selectionColumns?.add(this)
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        when (lastGroup) {
+            is SqlSelectKeywordGroupBlock -> lastGroup.selectionColumns.add(this)
+            is SqlUpdateColumnGroupBlock -> lastGroup.columnRawGroupBlocks.add(this)
+        }
+        (lastGroup as? SqlSelectKeywordGroupBlock)?.selectionColumns?.add(this)
+    }
 
     override fun createBlockIndentLen(): Int =
         parentBlock?.let { parent ->
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlUpdateValueGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlUpdateValueGroupBlock.kt
@@ -41,9 +41,9 @@ class SqlUpdateValueGroupBlock(
         indent.groupIndentLen = createGroupIndentLen()
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        (lastGroup as? SqlUpdateSetGroupBlock)?.valueGroupBlock = this
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlUpdateSetGroupBlock)?.valueGroupBlock = this
+    }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/UpdateClauseUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/UpdateClauseUtil.kt
@@ -29,9 +29,9 @@ object UpdateClauseUtil {
         sqlBlockFormattingCtx: SqlBlockFormattingContext,
     ): SqlBlock? =
         if (lastGroup is SqlUpdateSetGroupBlock) {
-            if (lastGroup.childBlocks.firstOrNull { it is SqlUpdateColumnGroupBlock } == null) {
+            if (lastGroup.assignmentSymbol == null) {
                 SqlUpdateColumnGroupBlock(child, sqlBlockFormattingCtx)
-            } else if (lastGroup.childBlocks.lastOrNull { it is SqlUpdateColumnGroupBlock } != null) {
+            } else if (lastGroup.columnDefinitionGroupBlock != null) {
                 SqlUpdateValueGroupBlock(child, sqlBlockFormattingCtx)
             } else {
                 SqlSubQueryGroupBlock(child, sqlBlockFormattingCtx)
