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

Author: xterao

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

@@ -31,26 +31,28 @@ import org.domaframework.doma.intellij.common.util.TypeUtil.isExpectedClassType
 import org.domaframework.doma.intellij.formatter.block.comment.SqlBlockCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlCommentBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlLineCommentBlock
+import org.domaframework.doma.intellij.formatter.block.conflict.SqlConflictClauseBlock
+import org.domaframework.doma.intellij.formatter.block.conflict.SqlDoGroupBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElBlockCommentBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.expr.SqlElSymbolBlock
 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.column.SqlDataTypeBlock
 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.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,6 +111,11 @@ open class SqlBlock(
     open fun setParentGroupBlock(lastGroup: SqlBlock?) {
         parentBlock = lastGroup
         parentBlock?.addChildBlock(this)
+        setParentPropertyBlock(lastGroup)
+    }
+
+    open fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        // This method can be overridden to set additional properties on the parent block if needed.
     }
 
     open val isNeedWhiteSpace: Boolean = true
@@ -206,12 +213,18 @@ open class SqlBlock(
                 SqlColumnDefinitionRawGroupBlock::class,
                 SqlCreateTableColumnDefinitionGroupBlock::class,
                 SqlUpdateColumnAssignmentSymbolBlock::class,
+                SqlDoGroupBlock::class,
             )
 
         if (isExpectedClassType(expectedClassTypes, childBlock)) return true
 
         if (isNewLineSqlComment(child, childBlock)) return true
 
+        if (lastGroup is SqlConflictClauseBlock) return false
+        if (childBlock is SqlColumnRawGroupBlock) {
+            return !childBlock.isFirstColumnGroup
+        }
+
         return (
             isNewLineGroupBlockAfterRegistrationChild(childBlock, lastGroup) ||
                 (childBlock is SqlRightPatternBlock && childBlock.isNewLine(lastGroup))
@@ -256,6 +269,9 @@ open class SqlBlock(
 
         if (parentSetProcessor.isNewGroupAndNotSetLineKeywords(childBlock, lastGroup)) {
             return if (lastGroup is SqlSubQueryGroupBlock) {
+                // サブグループ内の最初の要素以外なら改行
+                // この時、childBlocksもサブグループの最初の要素に入るため
+                // 最初の要素を無視して、他の要素が登録されているかをチェックする
                 val lastGroupChildren = lastGroup.childBlocks
                 (lastGroupChildren.isNotEmpty() && lastGroupChildren.drop(1).isNotEmpty())
             } else {
@@ -414,13 +430,20 @@ open class SqlBlock(
                 return blockUtil.getSubGroupBlock(lastGroup, child)
             }
 
-            SqlTypes.OTHER -> return if (lastGroup is SqlUpdateSetGroupBlock) {
-                SqlUpdateColumnAssignmentSymbolBlock(child, defaultFormatCtx)
-            } else {
-                SqlOtherBlock(
-                    child,
-                    defaultFormatCtx,
-                )
+            SqlTypes.OTHER -> {
+                return if (lastGroup is SqlUpdateSetGroupBlock &&
+                    lastGroup.columnDefinitionGroupBlock != null
+                ) {
+                    SqlUpdateColumnAssignmentSymbolBlock(
+                        child,
+                        defaultFormatCtx,
+                    )
+                } else {
+                    SqlOtherBlock(
+                        child,
+                        defaultFormatCtx,
+                    )
+                }
             }
 
             SqlTypes.RIGHT_PAREN -> return SqlRightPatternBlock(

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

@@ -17,13 +17,13 @@ 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.column.SqlColumnRawGroupBlock
 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.update.SqlUpdateColumnGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlColumnRawGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateValueGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlParallelListBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
-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
 import org.domaframework.doma.intellij.psi.SqlTypes

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

@@ -18,6 +18,7 @@ package org.domaframework.doma.intellij.formatter.block
 import com.intellij.formatting.Indent
 import com.intellij.lang.ASTNode
 import com.intellij.psi.formatter.common.AbstractBlock
+import org.domaframework.doma.intellij.formatter.block.conflict.SqlDoGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.SqlNewGroupBlock
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
@@ -42,11 +43,11 @@ open class SqlKeywordBlock(
         indent.groupIndentLen = indent.indentLen.plus(getNodeText().length)
     }
 
-//    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
-//        if (getNodeText() == "nothing" && lastGroup is SqlDoGroupBlock) {
-//            lastGroup.doQueryBlock = this
-//        }
-//    }
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        if (getNodeText() == "nothing" && lastGroup is SqlDoGroupBlock) {
+            lastGroup.doQueryBlock = this
+        }
+    }
 
     override fun buildChildren(): MutableList<AbstractBlock> = mutableListOf()
 

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

@@ -19,13 +19,15 @@ 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.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.conflict.SqlConflictClauseBlock
 import org.domaframework.doma.intellij.formatter.block.group.column.SqlColumnDefinitionRawGroupBlock
 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.insert.SqlInsertQueryGroupBlock
 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
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
@@ -62,6 +64,11 @@ open class SqlRightPatternBlock(
                 return
             }
 
+            if (parent.parentBlock is SqlConflictClauseBlock) {
+                preSpaceRight = false
+                return
+            }
+
             if (parent is SqlSubQueryGroupBlock) {
                 val prevKeywordBlock =
                     parent.childBlocks

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()
 }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlBlockCommentBlock.kt renamed to src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlBlockCommentBlock.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright Doma Tools Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.domaframework.doma.intellij.formatter.block.conflict
+
+enum class OnConflictKeywordType {
+    CONFLICT,
+    CONSTRAINT,
+    UNKNOWN,
+}

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlCommentBlock.kt renamed to src/main/kotlin/org/domaframework/doma/intellij/formatter/block/comment/SqlCommentBlock.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright Doma Tools Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.domaframework.doma.intellij.formatter.block.conflict
+
+import com.intellij.lang.ASTNode
+import org.domaframework.doma.intellij.formatter.block.SqlBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
+import org.domaframework.doma.intellij.formatter.util.IndentType
+import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
+
+class SqlConflictClauseBlock(
+    node: ASTNode,
+    context: SqlBlockFormattingContext,
+) : SqlKeywordGroupBlock(
+        node,
+        IndentType.TOP,
+        context,
+    ) {
+    var conflictType: OnConflictKeywordType = OnConflictKeywordType.CONFLICT
+    var doBlock: SqlDoGroupBlock? = null
+
+    override fun setParentGroupBlock(lastGroup: SqlBlock?) {
+        super.setParentGroupBlock(lastGroup)
+        indent.indentLevel = IndentType.CONFLICT
+        indent.indentLen = createBlockIndentLen()
+        indent.groupIndentLen = indent.indentLen.plus(getNodeText().length)
+    }
+}