From 7359bb8a00810c0b6fa6937bddc97893747f64ea Mon Sep 17 00:00:00 2001
From: Sergey Rostov <sergey.rostov@jetbrains.com>
Date: Fri, 28 Feb 2020 14:54:23 +0300
Subject: [PATCH] Fix tests freeze because of ScriptChangesNotifier (KT-37112)

 #KT-37112 Fixed
---
 .../script/configuration/listener/ScriptChangesNotifier.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt
index 496f3583976..ca03ef56f65 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt
@@ -45,8 +45,12 @@ internal class ScriptChangesNotifier(
                 }
 
                 private fun runScriptDependenciesUpdateIfNeeded(file: VirtualFile) {
-                    AppExecutorUtil.getAppExecutorService().submit {
+                    if (ApplicationManager.getApplication().isUnitTestMode) {
                         getListener(project, file)?.editorActivated(file, updater)
+                    } else {
+                        AppExecutorUtil.getAppExecutorService().submit {
+                            getListener(project, file)?.editorActivated(file, updater)
+                        }
                     }
                 }
             },