From 43e4dbb0b135eb2bd2b995145efeb26f634bf58a Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 20 Mar 2019 14:25:00 +0100 Subject: [PATCH] Fix tests after unblocking exceptions on loading script definitions should be temporary, proper solution needed in the future --- .../idea/script/AsyncScriptDefinitionsContributor.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/AsyncScriptDefinitionsContributor.kt b/idea/src/org/jetbrains/kotlin/idea/script/AsyncScriptDefinitionsContributor.kt index 99b97545624..8c14b066efa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/AsyncScriptDefinitionsContributor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/AsyncScriptDefinitionsContributor.kt @@ -42,7 +42,12 @@ abstract class AsyncScriptDefinitionsContributor(protected val project: Project) } return@write null } - backgroundTask?.queue() + // TODO: resolve actual reason for the exception below + try { + backgroundTask?.queue() + } catch (e: IllegalStateException) { + if (e.message?.contains("Calling invokeAndWait from read-action leads to possible deadlock") == false) throw e + } } protected abstract fun loadScriptDefinitions(previous: List?): List