Fix formatting for when with subjects (KT-27027)

#KT-27027 Fixed
This commit is contained in:
Nikolay Krasko
2018-09-25 17:48:39 +03:00
parent 0833f23d02
commit 1be491504a
4 changed files with 66 additions and 0 deletions
@@ -236,6 +236,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
beforeInside(SECONDARY_CONSTRUCTOR, TokenSet.create(BODY, CLASS_BODY)).lineBreakInCode()
beforeInside(CLASS, TokenSet.create(BODY, CLASS_BODY)).lineBreakInCode()
beforeInside(OBJECT_DECLARATION, TokenSet.create(BODY, CLASS_BODY)).lineBreakInCode()
beforeInside(PROPERTY, WHEN).spaces(0)
before(PROPERTY).lineBreakInCode()
after(DOC_COMMENT).lineBreakInCode()
+29
View File
@@ -0,0 +1,29 @@
fun test() {
when (val i = 1) {
}
when (var i = 2) {
}
when (var i = 2) {
}
when (var i = 2
) {
}
when (
val i = 3) {
}
when (
val i = 4) {
}
}
+31
View File
@@ -0,0 +1,31 @@
fun test() {
when (val i = 1) {
}
when (var i = 2) {
}
when ( var i = 2 ) {
}
when ( var i = 2
) {
}
when (
val i = 3) {
}
when (
val i = 4) {
}
}
@@ -776,6 +776,11 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
runTest("idea/testData/formatter/WhenLinesBeforeLbrace.after.kt");
}
@TestMetadata("WhenWithVariable.after.kt")
public void testWhenWithVariable() throws Exception {
runTest("idea/testData/formatter/WhenWithVariable.after.kt");
}
@TestMetadata("WhereClause.after.kt")
public void testWhereClause() throws Exception {
runTest("idea/testData/formatter/WhereClause.after.kt");