From 5e50b98103c80fb5d36e013891bac0d3d4ab6b3f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 24 Apr 2014 17:57:06 +0400 Subject: [PATCH] Fix comment to KT-3370 about no formatting of spaces around colon in objects #KT-3370 Fixed --- .../plugin/formatter/kotlinSpacingRules.kt | 2 ++ ...aceAroundExtendColonInObjects.after.inv.kt | 36 +++++++++++++++++++ .../SpaceAroundExtendColonInObjects.after.kt | 36 +++++++++++++++++++ .../SpaceAroundExtendColonInObjects.kt | 34 ++++++++++++++++++ .../formatter/JetFormatterTestGenerated.java | 14 ++++++-- 5 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt create mode 100644 idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt create mode 100644 idea/testData/formatter/SpaceAroundExtendColonInObjects.kt diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt index a32d616a498..d62faf931bc 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt +++ b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt @@ -115,6 +115,8 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder { afterInside(COLON, TYPE_CONSTRAINT).spaceIf(jetSettings.SPACE_AFTER_EXTEND_COLON) beforeInside(COLON, CLASS).spaceIf(jetSettings.SPACE_BEFORE_EXTEND_COLON) afterInside(COLON, CLASS).spaceIf(jetSettings.SPACE_AFTER_EXTEND_COLON) + beforeInside(COLON, OBJECT_DECLARATION).spaceIf(jetSettings.SPACE_BEFORE_EXTEND_COLON) + afterInside(COLON, OBJECT_DECLARATION).spaceIf(jetSettings.SPACE_AFTER_EXTEND_COLON) beforeInside(COLON, TYPE_PARAMETER).spaceIf(jetSettings.SPACE_BEFORE_EXTEND_COLON) afterInside(COLON, TYPE_PARAMETER).spaceIf(jetSettings.SPACE_AFTER_EXTEND_COLON) diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt new file mode 100644 index 00000000000..644cd7702a4 --- /dev/null +++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt @@ -0,0 +1,36 @@ +trait A + +object Some1: A { + +} + +object Some2: A + +object Some3 + +: + + +A + +val a = object: A { +} + +val b = object: A { +} + +class B { + class object: A { + + } +} + +class C { + class object: + A { + + } +} + +// SET_TRUE: SPACE_BEFORE_EXTEND_COLON +// SET_FALSE: SPACE_AFTER_EXTEND_COLON diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt new file mode 100644 index 00000000000..979b6a363ab --- /dev/null +++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt @@ -0,0 +1,36 @@ +trait A + +object Some1 :A { + +} + +object Some2 :A + +object Some3 + +: + + +A + +val a = object :A { +} + +val b = object :A { +} + +class B { + class object :A { + + } +} + +class C { + class object : + A { + + } +} + +// SET_TRUE: SPACE_BEFORE_EXTEND_COLON +// SET_FALSE: SPACE_AFTER_EXTEND_COLON diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.kt new file mode 100644 index 00000000000..f49e87910a2 --- /dev/null +++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.kt @@ -0,0 +1,34 @@ +trait A + +object Some1 : A { + +} + +object Some2:A + +object Some3 + +: + + +A + +val a = object:A {} + +val b = object : A {} + +class B { + class object:A { + + } +} + +class C { + class object : + A { + + } +} + +// SET_TRUE: SPACE_BEFORE_EXTEND_COLON +// SET_FALSE: SPACE_AFTER_EXTEND_COLON diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java index 2be4c631daa..213388c9ac4 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java @@ -254,6 +254,11 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { doTest("idea/testData/formatter/SpaceAroundExtendColon.after.kt"); } + @TestMetadata("SpaceAroundExtendColonInObjects.after.kt") + public void testSpaceAroundExtendColonInObjects() throws Exception { + doTest("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt"); + } + @TestMetadata("SpaceBeforeFunctionLiteral.after.kt") public void testSpaceBeforeFunctionLiteral() throws Exception { doTest("idea/testData/formatter/SpaceBeforeFunctionLiteral.after.kt"); @@ -327,9 +332,7 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { @TestMetadata("idea/testData/formatter/modifierList") public static class ModifierList extends AbstractJetFormatterTest { public void testAllFilesPresentInModifierList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", - new File("idea/testData/formatter/modifierList"), - Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/formatter/modifierList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); } @TestMetadata("funAnnotationBeforeAnnotation.after.kt") @@ -514,6 +517,11 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { doTestInverted("idea/testData/formatter/SpaceAroundExtendColon.after.inv.kt"); } + @TestMetadata("SpaceAroundExtendColonInObjects.after.inv.kt") + public void testSpaceAroundExtendColonInObjects() throws Exception { + doTestInverted("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt"); + } + @TestMetadata("SpacesAroundOperations.after.inv.kt") public void testSpacesAroundOperations() throws Exception { doTestInverted("idea/testData/formatter/SpacesAroundOperations.after.inv.kt");