From 9bb5022eb4722ed702f254c0ee8f5676eac92c21 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 12 Sep 2019 14:32:34 +0300
Subject: [PATCH] Move nested classes

---
 .../targets/js/testing/karma/KarmaConfig.kt   | 31 +++++++++----------
 .../targets/js/testing/karma/KotlinKarma.kt   |  3 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt
index 5040f021c83..8d50364ffa0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt
@@ -17,21 +17,20 @@ data class KarmaConfig(
     val reporters: MutableList<String> = mutableListOf(),
     val preprocessors: MutableMap<String, MutableList<String>> = mutableMapOf(),
     var coverageReporter: CoverageReporter? = null
-) {
-    data class CoverageReporter(
-        var dir: String,
-        val reporters: MutableList<Reporter> = mutableListOf()
-    ) {
+)
 
-        data class Reporter(
-            val type: String,
-            val subDir: String? = null,
-            val file: String? = null
-        )
-    }
+class CustomLauncher(var base: String) {
+    val flags = mutableListOf<String>()
+    var debug: Boolean? = null
+}
 
-    class CustomLauncher(var base: String) {
-        val flags = mutableListOf<String>()
-        var debug: Boolean? = null
-    }
-}
\ No newline at end of file
+data class CoverageReporter(
+    var dir: String,
+    val reporters: MutableList<Reporter> = mutableListOf()
+)
+
+data class Reporter(
+    val type: String,
+    val subDir: String? = null,
+    val file: String? = null
+)
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
index 2b5ea5d4ae8..7958b991ed3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework
-import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KarmaConfig.CoverageReporter.Reporter
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
 import org.slf4j.Logger
@@ -188,7 +187,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
             val reportDir = project.reportsDir.resolve("coverage/${it.name}")
             reportDir.mkdirs()
 
-            config.coverageReporter = KarmaConfig.CoverageReporter(reportDir.canonicalPath).also { coverage ->
+            config.coverageReporter = CoverageReporter(reportDir.canonicalPath).also { coverage ->
                 if (html) coverage.reporters.add(Reporter("html"))
                 if (lcov) coverage.reporters.add(Reporter("lcovonly"))
                 if (cobertura) coverage.reporters.add(Reporter("cobertura"))