From 4edfd0d960f06773e1a35751aa84c0785cba1989 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 17 Mar 2017 16:51:37 +0300 Subject: [PATCH] Move getting source position to manager thread in tests Real usages are performed in this thread too. Using AWT now fails under runInReadActionWithWriteActionPriorityWithRetries added in https://github.com/JetBrains/intellij-community/commit/b0e995b41e9f4c0d7a64b912d3708da179cf413c --- .../evaluate/AbstractKotlinEvaluateExpressionTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index e95e1c34303..2b3a5f2a7e1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt @@ -210,7 +210,7 @@ abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() { } private fun SuspendContextImpl.printFrame(variablesView: XVariablesView, watchesView: XWatchesViewImpl, config: PrinterConfig) { - val tree = variablesView.tree!! + val tree = variablesView.tree expandAll( tree, { @@ -316,7 +316,9 @@ abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() { append(getPrefix(descriptor)) append(label) if (config.shouldRenderSourcesPosition() && hasSourcePosition(descriptor)) { - val sp = SourcePositionProvider.getSourcePosition(descriptor, myProject, debuggerContext) + val sp = invokeInManagerThread { + SourcePositionProvider.getSourcePosition(descriptor, myProject, debuggerContext) + } append(" (sp = ${render(sp)})") }