aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/java/com/facebook
diff options
context:
space:
mode:
authorOmer Strulovich <ostrulovich@fb.com>2022-04-21 20:05:23 -0700
committerFacebook GitHub Bot <facebook-github-bot@users.noreply.github.com>2022-04-21 20:05:23 -0700
commitbfc9beda84931c105c192f670d1e75b55e4cfdaf (patch)
tree6f3ba9985e77657e9ce6e7a5a3d077bbcc415113 /core/src/main/java/com/facebook
parent4dc2273f9f487bba66d92230379d39787dce73d2 (diff)
downloadktfmt-bfc9beda84931c105c192f670d1e75b55e4cfdaf.tar.gz
Always break between when conditions, even if they fit in line
Summary: This request from Aloha makes prefect sense. I scanned through the changes in our codebase, and they all look better to me. Reviewed By: hick209 Differential Revision: D35802846 fbshipit-source-id: 3c6906ab70e200bb9ae31e155f36bf8a8b788051
Diffstat (limited to 'core/src/main/java/com/facebook')
-rw-r--r--core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt
index dee475a..ecf490b 100644
--- a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt
+++ b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt
@@ -1699,8 +1699,14 @@ class KotlinInputAstVisitor(
builder.token("else")
} else {
builder.block(ZERO) {
- forEachCommaSeparated(whenEntry.conditions.asIterable()) { visit(it) }
- builder.guessToken(",")
+ val conditions = whenEntry.conditions
+ for ((index, condition) in conditions.withIndex()) {
+ visit(condition)
+ builder.guessToken(",")
+ if (index != conditions.lastIndex) {
+ builder.forcedBreak()
+ }
+ }
}
}
val whenExpression = whenEntry.expression