Skip to content

Commit 5744c7b

Browse files
committed
Modify the formatting so that the equals sign (=) block in a bulk update statement is placed on a new line.
1 parent 29fcf34 commit 5744c7b

File tree

1 file changed

+9
-5
lines changed
  • src/main/kotlin/org/domaframework/doma/intellij/formatter/block

1 file changed

+9
-5
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlInlineSe
4343
import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
4444
import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateTableColumnDefinitionGroupBlock
4545
import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertColumnGroupBlock
46+
import org.domaframework.doma.intellij.formatter.block.group.keyword.update.SqlUpdateSetGroupBlock
4647
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlColumnRawGroupBlock
4748
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlDataTypeParamBlock
4849
import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlFunctionParamBlock
@@ -205,7 +206,6 @@ open class SqlBlock(
205206
SqlColumnDefinitionRawGroupBlock::class,
206207
SqlCreateTableColumnDefinitionGroupBlock::class,
207208
SqlUpdateColumnAssignmentSymbolBlock::class,
208-
SqlUpdateColumnAssignmentSymbolBlock::class,
209209
)
210210

211211
if (isExpectedClassType(expectedClassTypes, childBlock)) return true
@@ -414,10 +414,14 @@ open class SqlBlock(
414414
return blockUtil.getSubGroupBlock(lastGroup, child)
415415
}
416416

417-
SqlTypes.OTHER -> return SqlOtherBlock(
418-
child,
419-
defaultFormatCtx,
420-
)
417+
SqlTypes.OTHER -> return if (lastGroup is SqlUpdateSetGroupBlock) {
418+
SqlUpdateColumnAssignmentSymbolBlock(child, defaultFormatCtx)
419+
} else {
420+
SqlOtherBlock(
421+
child,
422+
defaultFormatCtx,
423+
)
424+
}
421425

422426
SqlTypes.RIGHT_PAREN -> return SqlRightPatternBlock(
423427
child,

0 commit comments

Comments
 (0)