commit edf9e05b1302468ec05b527d4452a6694d774509
author Ilya Kirillov <ilya.kirillov@jetbrains.com> Sat Jul 23 17:04:36 2022 +0200
committer Ilya Kirillov <ilya.kirillov@jetbrains.com> Sat Jul 23 17:08:22 2022 +0200
tree 4c2d934b6137ffbbacc1284e0ab10b0e9a56671d
parent 6f0769ea68cd004ded6f63551b22ff27c883a358

Distinguish cause attachments from exception attachments in KotlinExceptionWithAttachments

compiler/util/src/org/jetbrains/kotlin/utils/KotlinExceptionWithAttachments.kt

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinExceptionWithAttachments.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinExceptionWithAttachments.kt
index f6d9a4f..d903d9e 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinExceptionWithAttachments.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinExceptionWithAttachments.kt
@@ -7,6 +7,7 @@
 
 import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.openapi.diagnostic.ExceptionWithAttachments
+import java.nio.charset.StandardCharsets
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
@@ -17,7 +18,15 @@
 
     constructor(message: String?, cause: Throwable?) : super(message, cause) {
         if (cause is KotlinExceptionWithAttachments) {
-            attachments.addAll(cause.attachments)
+            attachments.addAll(
+                cause.attachments.map { a ->
+                    val content = a.openContentStream().use { it.reader(StandardCharsets.UTF_8).use { it.readText() } }
+                    Attachment("case_" + a.path, content)
+                }
+            )
+        }
+        if (cause != null) {
+            withAttachment("causeThrowable", cause.stackTraceToString())
         }
     }