Fixed indentation of Retuning when there are multiple column update.

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/second/SqlSecondKeywordBlock.kt

@@ -49,7 +49,7 @@ open class SqlSecondKeywordBlock(
 
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
         lastGroup?.let { last ->
-            val prevKeyword = last.childBlocks.dropLast(1).findLast { it is SqlKeywordBlock }
+            val prevKeyword = last.childBlocks.findLast { it is SqlKeywordBlock }
             prevKeyword?.let { prev ->
                 return !SqlKeywordUtil.isSetLineKeyword(getNodeText(), prev.getNodeText())
             }

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubQueryGroupBlock.kt

@@ -18,8 +18,8 @@ package org.domaframework.doma.intellij.formatter.block.group.subgroup
 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.SqlJoinQueriesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.condition.SqlConditionalExpressionGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlJoinQueriesGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithCommonTableGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithQuerySubGroupBlock
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext

src/main/kotlin/org/domaframework/doma/intellij/formatter/builder/SqlCustomSpacingBuilder.kt

@@ -123,25 +123,24 @@ class SqlCustomSpacingBuilder {
     }
 
     fun getSpacingRightPattern(block: SqlRightPatternBlock): Spacing? {
+        val paramBlock = block.parentBlock
         return when {
-            block.parentBlock is SqlCreateTableColumnDefinitionGroupBlock ||
-                block.parentBlock is SqlUpdateColumnGroupBlock ||
-                block.parentBlock is SqlUpdateValueGroupBlock -> {
+            paramBlock is SqlCreateTableColumnDefinitionGroupBlock ||
+                paramBlock is SqlUpdateColumnGroupBlock ||
+                (paramBlock is SqlUpdateValueGroupBlock && !paramBlock.subQueryValue) -> {
                 return getSpacing(block)
             }
 
-            block.parentBlock is SqlParallelListBlock -> {
-                if (block.parentBlock
-                        ?.childBlocks
-                        ?.dropLast(1)
-                        ?.lastOrNull() is SqlKeywordGroupBlock
-                ) {
-                    return normalSpacing
+            paramBlock is SqlParallelListBlock -> {
+                val lastKeywordGroup = paramBlock.childBlocks.dropLast(1).lastOrNull()
+                return if (lastKeywordGroup is SqlKeywordGroupBlock) {
+                    normalSpacing
+                } else {
+                    nonSpacing
                 }
-                return nonSpacing
             }
 
-            block.parentBlock is SqlDataTypeParamBlock -> nonSpacing
+            paramBlock is SqlDataTypeParamBlock -> nonSpacing
 
             block.preSpaceRight -> normalSpacing
             else -> nonSpacing

src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlSetParentGroupProcessor.kt

@@ -29,6 +29,7 @@ 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.SqlCreateViewGroupBlock
 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
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithCommonTableGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.with.SqlWithQuerySubGroupBlock
@@ -174,7 +175,7 @@ class SqlSetParentGroupProcessor(
                 // Since `DO UPDATE` does not include a `RETURNING` clause, it should be registered as a child of the parent `INSERT` query.
                 // The `DO` keyword should align with the `INSERT` query, and therefore it will serve as the **indentation anchor** for the following update block.
                 setParentGroups(context) { history ->
-                    val lastGroup = history.lastOrNull()
+                    val lastGroup = history.findLast { it is SqlTopQueryGroupBlock }
                     return@setParentGroups if (lastGroup is SqlUpdateQueryGroupBlock && lastGroup.parentBlock is SqlDoGroupBlock) {
                         lastGroup.parentBlock
                     } else {

src/test/testData/sql/formatter/InsertConflictUpdate.sql

@@ -3,6 +3,7 @@ SELECT name, user_id
 FROM user_settings
 WHERE user_id = /*employee.id*/0  AND name = /*employee.name*/'name'
 on conflict (id) do 
-update set name = EXCLUDED.name
+update set name = EXCLUDED.name,
+ email = default
 WHERE employees.name is Distinct from EXCLUDED.name
 returning id, manager_id, name

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

@@ -9,6 +9,7 @@ SELECT name
 ON CONFLICT (id)
 DO UPDATE
       SET name = EXCLUDED.name
+          , email = DEFAULT
     WHERE employees.name IS DISTINCT
      FROM EXCLUDED.name
 RETURNING id