From 5dcf531048e9c4e2b6a4bfd7c832559949ee4e7f Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 23 Dec 2015 16:23:10 +0300 Subject: [PATCH] Formatter: Leave single space between val/var and value parameter --- .../jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt | 4 ++++ idea/testData/formatter/ValVarSpaces.after.kt | 5 +++++ idea/testData/formatter/ValVarSpaces.kt | 5 +++++ .../jetbrains/kotlin/formatter/FormatterTestGenerated.java | 6 ++++++ 4 files changed, 20 insertions(+) create mode 100644 idea/testData/formatter/ValVarSpaces.after.kt create mode 100644 idea/testData/formatter/ValVarSpaces.kt diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt index 52ca56c630f..5040f36d342 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt @@ -144,6 +144,10 @@ 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) + 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) + betweenInside(VAR_KEYWORD, TYPE_REFERENCE, VALUE_PARAMETER).spaces(1) betweenInside(TYPE_PARAMETER_LIST, IDENTIFIER, PROPERTY).spaces(1) betweenInside(TYPE_REFERENCE, DOT, PROPERTY).spacing(0, 0, 0, false, 0) betweenInside(DOT, IDENTIFIER, PROPERTY).spacing(0, 0, 0, false, 0) diff --git a/idea/testData/formatter/ValVarSpaces.after.kt b/idea/testData/formatter/ValVarSpaces.after.kt new file mode 100644 index 00000000000..682c2fb6b89 --- /dev/null +++ b/idea/testData/formatter/ValVarSpaces.after.kt @@ -0,0 +1,5 @@ +class Foo(val x: Int, + var y: Int) { + val a = 1 + var b = 2 +} \ No newline at end of file diff --git a/idea/testData/formatter/ValVarSpaces.kt b/idea/testData/formatter/ValVarSpaces.kt new file mode 100644 index 00000000000..e94c2dbdfa7 --- /dev/null +++ b/idea/testData/formatter/ValVarSpaces.kt @@ -0,0 +1,5 @@ +class Foo(val x: Int, + var y: Int) { + val a = 1 + var b = 2 +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java index aa54bb5a5af..515c0ea9bad 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java @@ -517,6 +517,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest { doTest(fileName); } + @TestMetadata("ValVarSpaces.after.kt") + public void testValVarSpaces() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ValVarSpaces.after.kt"); + doTest(fileName); + } + @TestMetadata("When.after.kt") public void testWhen() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/When.after.kt");