Refactor CONFLICT keyword type branch handling

Co-authored-by: Copilot <[email protected]>

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockUtil.kt

@@ -126,20 +126,15 @@ class SqlBlockUtil(
 
             IndentType.CONFLICT -> {
                 if (lastGroupBlock is SqlConflictClauseBlock) {
-                    when (keywordText) {
-                        "conflict" -> {
-                            lastGroupBlock.conflictType = OnConflictKeywordType.CONFLICT
-                        }
-                        "constraint" -> {
-                            lastGroupBlock.conflictType = OnConflictKeywordType.CONSTRAINT
-                        }
-                        else -> {
-                            lastGroupBlock.conflictType = OnConflictKeywordType.UNKNOWN
-                        }
+                    lastGroupBlock.conflictType = when (keywordText) {
+                        "conflict" -> OnConflictKeywordType.CONFLICT
+                        "constraint" -> OnConflictKeywordType.CONSTRAINT
+                        else -> OnConflictKeywordType.UNKNOWN
                     }
                     return SqlKeywordBlock(child, indentLevel, sqlBlockFormattingCtx)
+                } else {
+                    return SqlConflictClauseBlock(child, sqlBlockFormattingCtx)
                 }
-                return SqlConflictClauseBlock(child, sqlBlockFormattingCtx)
             }
 
             else -> return SqlKeywordBlock(child, indentLevel, sqlBlockFormattingCtx)