From 0fff8ebf7147763f11d931403c137ae8316bd64b Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Fri, 10 Aug 2018 11:14:57 +0300
Subject: [PATCH] Fix SOE after enabling SAM conversions

---
 .../org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt
index 945e443afa2..cddbc4a41ce 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt
@@ -25,7 +25,7 @@ import javax.swing.SwingUtilities
 class EdtTestUtil {
     companion object {
         @TestOnly @JvmStatic fun runInEdtAndWait(runnable: Runnable) {
-            runInEdtAndWait { runnable.run() }
+            org.jetbrains.kotlin.test.testFramework.runInEdtAndWait { runnable.run() }
         }
     }
 }
@@ -42,7 +42,7 @@ fun runInEdtAndWait(runnable: () -> Unit) {
     else {
         try {
             val application = ApplicationManager.getApplication()
-                    .takeIf { it !is MockApplication } // because MockApplication do nothing instead of `invokeAndWait`
+                .takeIf { it !is MockApplication } // because MockApplication do nothing instead of `invokeAndWait`
             if (application != null)
                 application.invokeAndWait(runnable)
             else