From b4334a3a3b0123d46a761bb5fe83abce5cbf3dd8 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 21 Jul 2020 18:36:21 +0300 Subject: [PATCH] [Gradle, JS] Fix formatting in Gradle Kotlin/JS wizard ^KT-40149 fixed --- .../GradleKotlinFrameworkSupportProvider.kt | 13 +++++++++++-- .../GradleKotlinFrameworkSupportProviderUtils.kt | 2 +- ...tlinDslGradleKotlinFrameworkSupportProvider.kt | 15 +++++++++++---- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt index 643c14c169f..e222a9a535c 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt @@ -213,10 +213,19 @@ abstract class GradleKotlinJSFrameworkSupportProvider( ( additionalSubTargetSettings() ?.lines() - ?.joinToString("\n", "\n", "\n") { " $it" } ?: "" + ?.joinToString("\n", "\n", "\n") { line -> + if (line.isBlank()) { + line + } else { + line + .prependIndent() + .prependIndent() + .prependIndent() + } + } ?: "\n" ) + """ - } + } binaries.executable() } } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProviderUtils.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProviderUtils.kt index 7096bf8e56b..bc0dd409eb1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProviderUtils.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProviderUtils.kt @@ -78,7 +78,7 @@ internal fun browserConfiguration(): String { useKarma { useChromeHeadless() webpackConfig.cssSupport.enabled = true - } + } } """.trimIndent() } \ No newline at end of file diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt index 7a1ee3dc63d..63ceec0c16b 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt @@ -188,12 +188,19 @@ abstract class AbstractKotlinDslGradleKotlinJSFrameworkSupportProvider( ( additionalSubTargetSettings() ?.lines() - ?.joinToString("\n", "\n", "\n") { - " $it" - } ?: "" + ?.joinToString("\n", "\n", "\n") { line: String -> + if (line.isBlank()) { + line + } else { + line + .prependIndent() + .prependIndent() + .prependIndent() + } + } ?: "\n" ) + """ - } + } binaries.executable() } }