From 6b626860191f03bb9140136933067057d9c5899e Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 22 Feb 2017 20:02:26 +0300 Subject: [PATCH] Add blank lines tab to Kotlin code style UI with two basic options KEEP_BLANK_LINES_IN_CODE KEEP_BLANK_LINES_IN_DECLARATIONS #KT-15504 In Progress --- .../KotlinCodeStyleSettingsProvider.java | 1 + ...tlinLanguageCodeStyleSettingsProvider.java | 43 ++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java index 080bdb16909..8b9c4ca7e26 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java @@ -58,6 +58,7 @@ public class KotlinCodeStyleSettingsProvider extends CodeStyleSettingsProvider { addIndentOptionsTab(settings); addSpacesTab(settings); addWrappingAndBracesTab(settings); + addBlankLinesTab(settings); addTab(new ImportSettingsPanelWrapper(settings)); } }; diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.java index e644ee4fdf6..22e4a13cf0b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.java @@ -74,7 +74,41 @@ public class KotlinLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe " B\n" + "}\n" + ""; - + case BLANK_LINES_SETTINGS: + return + "class Foo {\n" + + " private var field1: Int = 1\n" + + " private val field2: String? = null\n" + + "\n" + + "\n" + + " init {\n" + + " field1 = 2;\n" + + " }\n" + + "\n" + + " fun foo1() {\n" + + " run {\n" + + " \n" + + " \n" + + " \n" + + " field1\n" + + " }\n" + + " }\n" + + "\n" + + "\n" + + " class InnerClass {\n" + + " }\n" + + "}\n" + + "\n" + + "\n" + + "\n" + + "class AnotherClass {\n" + + "}\n" + + "\n" + + "interface TestInterface {\n" + + "}\n" + + "fun run(f: () -> Unit) {\n" + + " f()\n" + + "}"; default: return "open class Some {\n"+ @@ -181,8 +215,15 @@ public class KotlinLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe "Put left brace on new line", CodeStyleSettingsCustomizable.WRAPPING_BRACES); break; + case BLANK_LINES_SETTINGS: + consumer.showStandardOptions( + "KEEP_BLANK_LINES_IN_CODE", + "KEEP_BLANK_LINES_IN_DECLARATIONS" + ); + break; default: consumer.showStandardOptions(); + break; } }