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

EdtTestUtil.runInEdtAndWait fix for proper user action emulation

Browse Source 
changed because `com.intellij.ide.IdeEventQueue` doesn't consider events from `SwingUtilities.invokeAndWait` as user interaction
This commit is contained in:
Nicolay Mitropolsky
2017-10-24 17:04:12 +03:00
committed by Nikolay Krasko
parent 0acfce55a8
commit 7758875955
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt
+6 -1
View File
@@ -16,6 +16,7 @@
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
@@ -39,7 +40,11 @@ fun runInEdtAndWait(runnable: () -> Unit) {
} }
else { else {
try { try {
SwingUtilities.invokeAndWait(runnable) val application = ApplicationManager.getApplication()
if (application != null)
application.invokeAndWait(runnable)
else
SwingUtilities.invokeAndWait(runnable)
} }
catch (e: InvocationTargetException) { catch (e: InvocationTargetException) {
throw e.cause ?: e throw e.cause ?: e