Skip to content

Commit 837597d

Browse files
authored
Merge pull request #177 from domaframework/renovate/com.pinterest.ktlint-ktlint-cli-1.x
Update dependency com.pinterest.ktlint:ktlint-cli to v1.6.0
2 parents bedb330 + 2a45dcb commit 837597d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ slf4j = { group = "org.slf4j", name = "slf4j-api", version = "2.0.17" }
1919
kotlinTest = { group = "org.jetbrains.kotlin", name = "kotlin-test" }
2020
domacore = { module = "org.seasar.doma:doma-core", version.ref = "doma" }
2121
google-java-format = { module = "com.google.googlejavaformat:google-java-format", version = "1.27.0" }
22-
ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version = "1.5.0" }
22+
ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version = "1.6.0" }
2323
jackson = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version = "2.19.0" }
2424

2525
[plugins]

src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlBlockBuilder.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ open class SqlBlockBuilder {
9393
fun getConditionOrLoopBlocksLast(): SqlElConditionLoopCommentBlock? = conditionOrLoopBlocks.lastOrNull()
9494

9595
fun addConditionOrLoopBlock(block: SqlElConditionLoopCommentBlock) {
96-
if (!block.conditionType.isInvalid() && !block.conditionType.isEnd()
97-
) {
96+
if (!block.conditionType.isInvalid() && !block.conditionType.isEnd()) {
9897
conditionOrLoopBlocks.add(block)
9998
}
10099
}

0 commit comments

Comments
 (0)