[Gradle, JS] Config errors in webpack

#KT-38286 fixed
JetBrains · Apr 16, 2020 · f8c44be · f8c44be
1 parent 36525d6
commit f8c44be
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
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
@@ -16,6 +16,9 @@ class TeamCityMessageCommonClient(
     private val log: Logger,
     private val progressLogger: ProgressLogger
 ) : ServiceMessageParserCallback {
+
+    private val stackTraceProcessor = TeamCityMessageStackTraceProcessor()
+
     override fun parseException(e: ParseException, text: String) {
         log.error("Failed to parse test process messages: \"$text\"", e)
     }
@@ -30,7 +33,15 @@ class TeamCityMessageCommonClient(
         val value = text.trimEnd()
         progressLogger.progress(value)
 
-        type?.let { log.processLogMessage(value, it) }
+        var actualType = type
+        stackTraceProcessor.process(text) { line ->
+            actualType = ERROR
+            if (line != null) {
+                printMessage(line, actualType)
+            }
+        }
+
+        actualType?.let { log.processLogMessage(value, it) }
     }
 
     override fun regularText(text: String) {

diff --git a/.../main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityMessageStackTraceProcessor.kt b/.../main/kotlin/org/jetbrains/kotlin/gradle/targets/js/TeamCityMessageStackTraceProcessor.kt
@@ -10,6 +10,8 @@ internal class TeamCityMessageStackTraceProcessor {
 
     fun process(text: String, firstLineAction: (String?) -> Unit) {
         firstLine = if (text.trim().startsWith("at ")) {
+            // firstLineAction can have side effects
+            // that's why important to call it even with null line
             firstLineAction(firstLine)
             null
         } else {