Skip to content

Commit 1be4915

Browse files
committed
Fix formatting for when with subjects (KT-27027)
#KT-27027 Fixed
1 parent 0833f23 commit 1be4915

File tree

4 files changed

+66
-0
lines changed

4 files changed

+66
-0
lines changed

idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
236236
beforeInside(SECONDARY_CONSTRUCTOR, TokenSet.create(BODY, CLASS_BODY)).lineBreakInCode()
237237
beforeInside(CLASS, TokenSet.create(BODY, CLASS_BODY)).lineBreakInCode()
238238
beforeInside(OBJECT_DECLARATION, TokenSet.create(BODY, CLASS_BODY)).lineBreakInCode()
239+
beforeInside(PROPERTY, WHEN).spaces(0)
239240
before(PROPERTY).lineBreakInCode()
240241

241242
after(DOC_COMMENT).lineBreakInCode()
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
fun test() {
2+
when (val i = 1) {
3+
4+
}
5+
6+
when (var i = 2) {
7+
8+
}
9+
10+
when (var i = 2) {
11+
12+
}
13+
14+
when (var i = 2
15+
) {
16+
17+
}
18+
19+
when (
20+
val i = 3) {
21+
22+
}
23+
24+
when (
25+
26+
27+
val i = 4) {
28+
}
29+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
fun test() {
2+
when (val i = 1) {
3+
4+
}
5+
6+
when (var i = 2) {
7+
8+
}
9+
10+
when ( var i = 2 ) {
11+
12+
}
13+
14+
when ( var i = 2
15+
) {
16+
17+
}
18+
19+
when (
20+
val i = 3) {
21+
22+
}
23+
24+
when (
25+
26+
27+
28+
29+
val i = 4) {
30+
}
31+
}

idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)