From b8aff0660c2981b587fdb452828d87859febe0d8 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 18 Jun 2020 17:24:33 +0300
Subject: [PATCH] Refactor aligning for css support

#KT-39770 fixed
---
 .../GradleKotlinFrameworkSupportProvider.kt   | 10 +++++--
 ...adleKotlinFrameworkSupportProviderUtils.kt | 27 ++++++++++---------
 ...DslGradleKotlinFrameworkSupportProvider.kt | 12 +++++++--
 3 files changed, 33 insertions(+), 16 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 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()
                     }
                 }