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

Debugger: Fix missing read action in error reporting

Browse Source
This commit is contained in:
Yan Zhulanow
2019-04-08 23:46:22 +03:00
parent 4f6c8d2323
commit fa5705cc68
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
+14 -12
View File
@@ -426,20 +426,22 @@ private fun isSpecialException(th: Throwable): Boolean {
} }
private fun reportError(codeFragment: KtCodeFragment, position: SourcePosition?, message: String, throwable: Throwable? = null) { private fun reportError(codeFragment: KtCodeFragment, position: SourcePosition?, message: String, throwable: Throwable? = null) {
val contextFile = codeFragment.context?.containingFile runReadAction {
val contextFile = codeFragment.context?.containingFile
val attachments = arrayOf( val attachments = arrayOf(
attachmentByPsiFile(contextFile), attachmentByPsiFile(contextFile),
attachmentByPsiFile(codeFragment), attachmentByPsiFile(codeFragment),
Attachment("breakpoint.info", "Position: " + position?.run { "${file.name}:$line" }), Attachment("breakpoint.info", "Position: " + position?.run { "${file.name}:$line" }),
Attachment("context.info", runReadAction { codeFragment.context?.text ?: "null" }) Attachment("context.info", runReadAction { codeFragment.context?.text ?: "null" })
) )
LOG.error( LOG.error(
"Cannot evaluate a code fragment of type " + codeFragment::class.java + ": " + message.decapitalize(), "Cannot evaluate a code fragment of type " + codeFragment::class.java + ": " + message.decapitalize(),
throwable, throwable,
mergeAttachments(*attachments) mergeAttachments(*attachments)
) )
}
} }
private fun evaluationException(msg: String): Nothing = throw EvaluateExceptionUtil.createEvaluateException(msg) private fun evaluationException(msg: String): Nothing = throw EvaluateExceptionUtil.createEvaluateException(msg)