From fa6b5b567b1f45365be80e72a961415d8bc98774 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Wed, 21 Aug 2019 13:15:40 +0300
Subject: [PATCH] Fix
 org.jetbrains.kotlin.idea.script.ScriptConfigurationHighlightingTestGenerated.Highlighting.testThrowingResolver

---
 .../idea/highlighter/ScriptExternalHighlightingPass.kt     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt
index 110af7cf71e..d137df5dbb9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt
@@ -57,12 +57,15 @@ class ScriptExternalHighlightingPass(
 
         val annotations = reports.mapNotNull { scriptDiagnostic ->
             val (startOffset, endOffset) = scriptDiagnostic.location?.let { computeOffsets(document, it) } ?: 0 to 0
+            val exception = scriptDiagnostic.exception
+            val exceptionMessage = if (exception != null) " ($exception)" else ""
+            val message = scriptDiagnostic.message + exceptionMessage
             val annotation = Annotation(
                 startOffset,
                 endOffset,
                 scriptDiagnostic.severity.convertSeverity() ?: return@mapNotNull null,
-                scriptDiagnostic.message,
-                scriptDiagnostic.message
+                message,
+                message
             )
 
             // if range is empty, show notification panel in editor