User: rednesto Date: 30 May 24 22:26 Revision: abdf7932135761ae82c9d2f88ebf7309fd1b563b Summary: Fix deprecated API usage TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9308&personal=false Index: src/main/kotlin/util/utils.kt =================================================================== --- src/main/kotlin/util/utils.kt (revision 374511f5b31309bdeff3fb70ddad630c25c49bdb) +++ src/main/kotlin/util/utils.kt (revision abdf7932135761ae82c9d2f88ebf7309fd1b563b) @@ -23,7 +23,6 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.intellij.codeInspection.InspectionProfileEntry -import com.intellij.openapi.application.AppUIExecutor import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ModalityState import com.intellij.openapi.application.WriteAction @@ -107,10 +106,6 @@ ApplicationManager.getApplication().invokeLater(func, ModalityState.any()) } -fun invokeEdt(block: () -> T): T { - return AppUIExecutor.onUiThread().submit(block).get() -} - inline fun runWriteActionAndWait(crossinline action: () -> T): T { return WriteAction.computeAndWait(ThrowableComputable { action() }) } Index: src/test/kotlin/framework/EdtInterceptor.kt =================================================================== --- src/test/kotlin/framework/EdtInterceptor.kt (revision 374511f5b31309bdeff3fb70ddad630c25c49bdb) +++ src/test/kotlin/framework/EdtInterceptor.kt (revision abdf7932135761ae82c9d2f88ebf7309fd1b563b) @@ -20,8 +20,10 @@ package com.demonwav.mcdev.framework -import com.demonwav.mcdev.util.invokeEdt +import com.intellij.openapi.application.EDT import java.lang.reflect.Method +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.api.extension.InvocationInterceptor import org.junit.jupiter.api.extension.ReflectiveInvocationContext @@ -60,7 +62,7 @@ return } - val thrown = invokeEdt { + val thrown = runBlocking(Dispatchers.EDT) { runCatching { invocation.proceed() }.exceptionOrNull()