Fix the line break and indentation for comma lines.

Author: xterao

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

@@ -17,9 +17,10 @@ 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
 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.insert.SqlInsertColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateColumnGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateValueGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlParallelListBlock
@@ -63,8 +64,14 @@ open class SqlCommaBlock(
                     return 0
                 }
 
+                val parentIndentSyncBlockTypes =
+                    listOf(
+                        SqlUpdateColumnGroupBlock::class,
+                        SqlUpdateValueGroupBlock::class,
+                        SqlInsertColumnGroupBlock::class,
+                    )
                 val parentIndentLen = parent.indent.groupIndentLen
-                if (parent is SqlUpdateColumnGroupBlock || parent is SqlUpdateValueGroupBlock) {
+                if (TypeUtil.isExpectedClassType(parentIndentSyncBlockTypes, parent)) {
                     return parentIndentLen
                 }
 
@@ -74,17 +81,15 @@ open class SqlCommaBlock(
                         val grandIndentLen = grand.indent.groupIndentLen
                         return grandIndentLen.plus(parentIndentLen).minus(1)
                     }
-                    if (grand is SqlInsertQueryGroupBlock) {
-                        return parentIndentLen
-                    }
+
                     if (grand is SqlColumnRawGroupBlock) {
                         val grandIndentLen = grand.indent.groupIndentLen
                         var prevTextLen = 1
                         parent.prevChildren?.dropLast(1)?.forEach { prev -> prevTextLen = prevTextLen.plus(prev.getNodeText().length) }
                         return grandIndentLen.plus(prevTextLen).plus(1)
                     }
                 }
-                return parentIndentLen
+                return parentIndentLen.plus(1)
             } else {
                 var prevLen = 0
                 parent.childBlocks

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/insert/SqlInsertValueGroupBlock.kt

@@ -27,7 +27,6 @@ class SqlInsertValueGroupBlock(
     override fun createBlockIndentLen(): Int {
         parentBlock?.let { parent ->
             return parent.indent.groupIndentLen.plus(1)
-            return 1
         } ?: return 1
     }
 }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateQueryGroupBlock.kt

@@ -19,9 +19,7 @@ import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.conflict.SqlDoGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlTopQueryGroupBlock
-import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
-import org.domaframework.doma.intellij.formatter.util.SqlKeywordUtil
 
 class SqlUpdateQueryGroupBlock(
     node: ASTNode,
@@ -43,30 +41,22 @@ class SqlUpdateQueryGroupBlock(
         createGroupIndentLen()
     }
 
+    override fun setParentPropertyBlock(lastGroup: SqlBlock?) {
+        (lastGroup as? SqlDoGroupBlock)?.doQueryBlock = this
+    }
+
     override fun getBaseIndentLen(
         preChildBlock: SqlBlock?,
-        block: SqlBlock?,
+        lastGroup: SqlBlock?,
     ): Int {
-        if (block == null) {
+        if (lastGroup == null) {
             return createBlockIndentLen(preChildBlock)
         }
-        if (preChildBlock == null) return createBlockIndentLen(preChildBlock)
 
-        if (preChildBlock.indent.indentLevel == this.indent.indentLevel &&
-            !SqlKeywordUtil.Companion.isSetLineKeyword(getNodeText(), preChildBlock.getNodeText())
-        ) {
-            if (indent.indentLevel == IndentType.SECOND) {
-                val diffPreBlockTextLen = getNodeText().length.minus(preChildBlock.getNodeText().length)
-                return preChildBlock.indent.indentLen.minus(diffPreBlockTextLen)
-            } else {
-                val diffPretextLen = getNodeText().length.minus(preChildBlock.getNodeText().length)
-                return preChildBlock.indent.indentLen.minus(diffPretextLen)
-            }
+        return if (lastGroup is SqlDoGroupBlock) {
+            lastGroup.getNodeText().length.plus(1)
         } else {
-            if (preChildBlock is SqlDoGroupBlock && getNodeText() == "update") {
-                preChildBlock.doQueryBlock = this
-            }
-            return createBlockIndentLen(preChildBlock)
+            createBlockIndentLen(preChildBlock)
         }
     }
 }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/update/SqlUpdateSetGroupBlock.kt

@@ -31,8 +31,6 @@ open class SqlUpdateSetGroupBlock(
         IndentType.SECOND,
         context,
     ) {
-    val updateColumnRaws: MutableList<SqlBlock> = mutableListOf()
-
     // A block used for bulk updates.
     // It contains a **column group**, an **equals sign (`=`)**, and a **value group block**.
     var columnDefinitionGroupBlock: SqlUpdateColumnGroupBlock? = null
@@ -55,17 +53,13 @@ open class SqlUpdateSetGroupBlock(
     override fun getIndent(): Indent? = Indent.getSpaceIndent(indent.indentLen)
 
     override fun createBlockIndentLen(preChildBlock: SqlBlock?): Int =
-        if (!isAdjustIndentOnEnter()) {
+        if (isAdjustIndentOnEnter()) {
+            0
+        } else {
             parentBlock?.let { parent ->
-                if (parent.indent.indentLevel == IndentType.SUB) {
-                    parent.indent.groupIndentLen.plus(1)
-                } else {
-                    val parentTextLen = parent.getNodeText().length
-                    val diffTextLen = parentTextLen.minus(getNodeText().length)
-                    parent.indent.indentLen.plus(diffTextLen)
-                }
+                val parentTextLen = parent.getNodeText().length
+                val diffTextLen = parentTextLen.minus(getNodeText().length)
+                parent.indent.indentLen.plus(diffTextLen)
             } ?: 0
-        } else {
-            0
         }
 }

src/test/testData/sql/formatter/InsertConflictNothing.sql

@@ -1,3 +1,2 @@
-insert into users (username, email)
-values ('user', '[email protected]')
-on CONFLICT(username) do nothing
+insert into employee (id, username) values ( /* employees.id */0, /* employees.name */'name')
+on conflict (username) do nothing

src/test/testData/sql/formatter/InsertConflictNothing_format.sql

@@ -1,7 +1,7 @@
-INSERT INTO users
-            (username
-             , email)
-     VALUES ('user'             
-              , '[email protected]')
-ON CONFLICT(username) 
+INSERT INTO employee
+            (id
+             , username)
+     VALUES ( /* employees.id */0
+             , /* employees.name */'name')
+ON CONFLICT (username)
 DO NOTHING 

src/test/testData/sql/formatter/InsertConflictUpdate_format.sql

@@ -3,7 +3,7 @@ INSERT INTO users
              , email)
      VALUES ('user'
              , '[email protected]')
-ON CONFLICT(username) ON CONSTRAINT 
+ON CONFLICT (username) ON CONSTRAINT
 DO UPDATE
       SET email = EXCLUDED.email
           , created_at = CURRENT_TIMESTAMP