azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix org.jetbrains.kotlin.idea.script.ScriptConfigurationHighlightingTestGenerated.Highlighting.testThrowingResolver

Browse Source
This commit is contained in:
Natalia Selezneva
2019-08-21 13:15:40 +03:00
parent 961e8c2c74
commit fa6b5b567b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt
+5 -2
View File
@@ -57,12 +57,15 @@ class ScriptExternalHighlightingPass(
val annotations = reports.mapNotNull { scriptDiagnostic -> val annotations = reports.mapNotNull { scriptDiagnostic ->
val (startOffset, endOffset) = scriptDiagnostic.location?.let { computeOffsets(document, it) } ?: 0 to 0 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( val annotation = Annotation(
startOffset, startOffset,
endOffset, endOffset,
scriptDiagnostic.severity.convertSeverity() ?: return@mapNotNull null, scriptDiagnostic.severity.convertSeverity() ?: return@mapNotNull null,
scriptDiagnostic.message, message,
scriptDiagnostic.message message
) )
// if range is empty, show notification panel in editor // if range is empty, show notification panel in editor