"Code formatter doesn't remove spaces in single line properties" fixed (KT-11076)

#KT-11076 Fixed
This commit is contained in:
Nikolay Krasko
2016-03-14 14:28:08 +03:00
parent 2db888a646
commit 94e8ba7c4b
4 changed files with 43 additions and 0 deletions
@@ -145,6 +145,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
betweenInside(VAR_KEYWORD, IDENTIFIER, PROPERTY).spaces(1)
betweenInside(VAL_KEYWORD, TYPE_REFERENCE, PROPERTY).spaces(1)
betweenInside(VAR_KEYWORD, TYPE_REFERENCE, PROPERTY).spaces(1)
beforeInside(PROPERTY_ACCESSOR, PROPERTY).spacing(1, 0, 0, true, 0)
betweenInside(VAL_KEYWORD, IDENTIFIER, VALUE_PARAMETER).spaces(1)
betweenInside(VAR_KEYWORD, IDENTIFIER, VALUE_PARAMETER).spaces(1)
betweenInside(VAL_KEYWORD, TYPE_REFERENCE, VALUE_PARAMETER).spaces(1)
+15
View File
@@ -0,0 +1,15 @@
class Hi {
val simple: Int get() = 1
val newline: String
get() = ""
var getterAndSetter: Int = 0
get() = 1
set(some) {
field = some
}
var badNoType get() = 1
}
+21
View File
@@ -0,0 +1,21 @@
class Hi {
val simple: Int get() = 1
val newline: String
get() = ""
var getterAndSetter: Int = 0
get() = 1
set(some) {
field = some
}
var badNoType get() = 1
}
@@ -403,6 +403,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
doTest(fileName);
}
@TestMetadata("PropertyAccessors.after.kt")
public void testPropertyAccessors() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/PropertyAccessors.after.kt");
doTest(fileName);
}
@TestMetadata("PropertyTypeParameterList.after.kt")
public void testPropertyTypeParameterList() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/PropertyTypeParameterList.after.kt");