From 6d7c88a2bc3dae7d7a890cd9249f9a6ad4465442 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 6 Sep 2017 15:01:07 +0300 Subject: [PATCH] Fix KotlinWithGradleConfigurator, get psi files under read action EA-106672 Fixed --- .../idea/configuration/KotlinWithGradleConfigurator.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt index 62692e0ee4c..3671e6e48ac 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.kt @@ -44,6 +44,7 @@ import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersi import org.jetbrains.kotlin.idea.quickfix.ChangeCoroutineSupportFix import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.idea.util.application.executeWriteCommand +import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.versions.LibraryJarDescriptor import org.jetbrains.kotlin.idea.versions.getStdlibArtifactId import org.jetbrains.kotlin.psi.KtFile @@ -64,7 +65,12 @@ abstract class KotlinWithGradleConfigurator : KotlinProjectConfigurator { return ConfigureKotlinStatus.CONFIGURED } - val buildFiles = listOf(module.getBuildScriptPsiFile(), module.project.getTopLevelBuildScriptPsiFile()).filterNotNull() + val buildFiles = runReadAction { + listOf( + module.getBuildScriptPsiFile(), + module.project.getTopLevelBuildScriptPsiFile() + ).filterNotNull() + } if (buildFiles.isEmpty()) { return ConfigureKotlinStatus.NON_APPLICABLE