diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityMessageCommonClient.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityMessageCommonClient.kt index c8e6b3d30fc..689e9c99801 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityMessageCommonClient.kt +++ b/libraries/tools/kotlin-gradle-plugin/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/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityServiceMessages.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityServiceMessages.kt index 819758030d4..5129b57258d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityServiceMessages.kt +++ b/libraries/tools/kotlin-gradle-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/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 820285ae670..22a9c70e3be 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 @@ -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 {