From 68e072789405ed2c5cb02a5399386476cc95bb30 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 6 Jul 2017 16:57:58 +0300 Subject: [PATCH] Force space between `{` and first enum entry (KT-18863) #KT-18863 Fixed --- .../org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt | 1 + idea/testData/formatter/EmptyLineBetweenEnumEntries.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt index 6c419b9f934..b4d1ff09b63 100644 --- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt +++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt @@ -501,6 +501,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing beforeInside(RBRACE, BLOCK).spacing(1, 0, 1, commonCodeStyleSettings.KEEP_LINE_BREAKS, commonCodeStyleSettings.KEEP_BLANK_LINES_BEFORE_RBRACE) + between(LBRACE, ENUM_ENTRY).spacing(1, 0, 0, true, commonCodeStyleSettings.KEEP_BLANK_LINES_IN_CODE) beforeInside(RBRACE, WHEN).lineBreakInCode() between(RPAR, BODY).spaces(1) diff --git a/idea/testData/formatter/EmptyLineBetweenEnumEntries.kt b/idea/testData/formatter/EmptyLineBetweenEnumEntries.kt index 94c2f0f2e87..505c2ff17b2 100644 --- a/idea/testData/formatter/EmptyLineBetweenEnumEntries.kt +++ b/idea/testData/formatter/EmptyLineBetweenEnumEntries.kt @@ -1,4 +1,4 @@ -enum class E1 { F, S, T } +enum class E1 {F, S, T } enum class E2 { F, S, T