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 b0c9e82858b..643c14c169f 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 @@ -209,8 +209,14 @@ abstract class GradleKotlinJSFrameworkSupportProvider( kotlin { js { $jsSubTargetName { - ${additionalSubTargetSettings() ?: ""} - } + """.trimIndent() + + ( + additionalSubTargetSettings() + ?.lines() + ?.joinToString("\n", "\n", "\n") { " $it" } ?: "" + ) + + """ + } 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 64975f224ee..26949714dbf 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 @@ -66,16 +66,19 @@ internal fun addBrowserSupport(module: Module) { internal fun browserConfiguration(): String { return """ - |val cssSupport = { task: KotlinWebpack - | task.cssSupport.enabled = true - |} - | - |webpackTask { - | cssSupport(it) - |} - | - |runTask { - | cssSupport(it) - |} - """.trimMargin() + webpackTask { + cssSupport.enabled = true + } + + runTask { + cssSupport.enabled = true + } + + testTask { + 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 0a190ecf51d..7a1ee3dc63d 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 @@ -184,8 +184,16 @@ abstract class AbstractKotlinDslGradleKotlinJSFrameworkSupportProvider( kotlin { js { $jsSubTargetName { - ${additionalSubTargetSettings() ?: ""} - } + """.trimIndent() + + ( + additionalSubTargetSettings() + ?.lines() + ?.joinToString("\n", "\n", "\n") { + " $it" + } ?: "" + ) + + """ + } binaries.executable() } }