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

FIR IDE: throw PCE in highlighter & reference resolver if on EDT thread

Browse Source 
As resolve is not allowed in EDT thread
This commit is contained in:
Ilya Kirillov
2020-06-07 13:47:32 +03:00
parent 19043537c1
commit 87a65c0e4b
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt
+11 -3
View File
@@ -1,11 +1,12 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.resolve
import com.google.common.collect.Lists
import com.intellij.openapi.application.ApplicationManager
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiPolyVariantReference
import com.intellij.psi.PsiReference
@@ -16,9 +17,11 @@ import org.jetbrains.kotlin.idea.completion.test.configureWithExtraFile
import org.jetbrains.kotlin.idea.test.KotlinLightPlatformCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.util.renderAsGotoImplementation
import org.junit.Assert
import java.util.concurrent.Callable
import kotlin.test.assertTrue
abstract class AbstractReferenceResolveTest : KotlinLightPlatformCodeInsightFixtureTestCase() {
@@ -66,7 +69,9 @@ abstract class AbstractReferenceResolveTest : KotlinLightPlatformCodeInsightFixt
assertTrue(psiReference is PsiPolyVariantReference)
psiReference as PsiPolyVariantReference
val results = wrapReference(psiReference).multiResolve(true)
val results = executeOnPooledThreadInReadAction {
wrapReference(psiReference).multiResolve(true)
}
val actualResolvedTo = Lists.newArrayList<String>()
for (result in results) {
@@ -128,7 +133,7 @@ abstract class AbstractReferenceResolveTest : KotlinLightPlatformCodeInsightFixt
) {
val expectedString = expectedResolveData.referenceString
if (psiReference != null) {
val resolvedTo = psiReference.resolve()
val resolvedTo = executeOnPooledThreadInReadAction { psiReference.resolve() }
if (resolvedTo != null) {
checkResolvedTo(resolvedTo)
val resolvedToElementStr = replacePlaceholders(resolvedTo.renderAsGotoImplementation())
@@ -161,3 +166,6 @@ abstract class AbstractReferenceResolveTest : KotlinLightPlatformCodeInsightFixt
}
}
}
private fun <R> executeOnPooledThreadInReadAction(action: () -> R): R =
ApplicationManager.getApplication().executeOnPooledThread<R> { runReadAction(action) }.get()