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

172: Revert "EdtTestUtil.runInEdtAndWait fix for proper user action emulation"

Browse Source 
This reverts commit 4ebe750d36e86545a72177f91dc3baaa235fa92d.
This commit is contained in:
Nikolay Krasko
2018-01-11 20:12:26 +03:00
parent 1010c1285a
commit d6cc3d64fe
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt.172
+1 -6
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.test.testFramework package org.jetbrains.kotlin.test.testFramework
import com.intellij.openapi.application.ApplicationManager
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import java.lang.reflect.InvocationTargetException import java.lang.reflect.InvocationTargetException
import javax.swing.SwingUtilities import javax.swing.SwingUtilities
@@ -40,11 +39,7 @@ fun runInEdtAndWait(runnable: () -> Unit) {
} }
else { else {
try { try {
val application = ApplicationManager.getApplication() SwingUtilities.invokeAndWait(runnable)
if (application != null)
application.invokeAndWait(runnable)
else
SwingUtilities.invokeAndWait(runnable)
} }
catch (e: InvocationTargetException) { catch (e: InvocationTargetException) {
throw e.cause ?: e throw e.cause ?: e