[Gradle, JS] Refactor check on error

#KT-38109 fixed
JetBrains · Apr 16, 2020 · 77d8864 · 77d8864
1 parent 5969f1d
commit 77d8864
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...gin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityMessageCommonClient.kt b/...gin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityMessageCommonClient.kt
@@ -48,8 +48,8 @@ class TeamCityMessageCommonClient(
 
         if (inStackTrace) return
 
-        when (type) {
-            LogType.ERROR, LogType.WARN -> errors.add(value.clearAnsiColor())
+        if (type?.isErrorLike() == true) {
+            errors.add(value.clearAnsiColor())
         }
 
         type?.let { log.processLogMessage(value, it) }

diff --git a/...-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityServiceMessages.kt b/...-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityServiceMessages.kt
@@ -66,6 +66,10 @@ enum class LogType(val value: String) {
     DEBUG("debug"),
     LOG("log");
 
+    fun isErrorLike(): Boolean {
+        return this == ERROR || this == WARN
+    }
+
     companion object {
         fun byValueOrNull(value: String?): LogType? {
             if (value == null) return null

diff --git a/...lugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/...lugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
@@ -451,10 +451,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
                         val actualText = if (launcherMessage != null) {
                             val (logLevel, message) = launcherMessage.destructured
                             actualType = LogType.byValueOrNull(logLevel.toLowerCase())
-                            when (actualType) {
-                                LogType.WARN, LogType.ERROR -> {
-                                    processFailedBrowsers(text)
-                                }
+                            if (actualType?.isErrorLike() == true) {
+                                processFailedBrowsers(text)
                             }
                             message
                         } else {