User: kyle wood Date: 16 Nov 25 03:20 Revision: fa06b3b02e9e5e1c8f69cb1042e894402da7fadb Summary: Read Gradle model data in read action Fixes: MCDEV-Z TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10293&personal=false Index: src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleProjectResolverExtension.kt =================================================================== --- src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleProjectResolverExtension.kt (revision 839cca715cac92ce11872dce6a48a8b78ca58d76) +++ src/main/kotlin/platform/mcp/vanillagradle/VanillaGradleProjectResolverExtension.kt (revision fa06b3b02e9e5e1c8f69cb1042e894402da7fadb) @@ -21,6 +21,7 @@ package com.demonwav.mcdev.platform.mcp.vanillagradle import com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle.VanillaGradleModel +import com.intellij.openapi.application.runReadAction import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.project.ModuleData import org.gradle.tooling.model.idea.IdeaModule @@ -34,7 +35,9 @@ override fun getToolingExtensionsClasses() = extraProjectModelClasses override fun populateModuleExtraModels(gradleModule: IdeaModule, ideModule: DataNode) { - val vgData = resolverCtx.getExtraProject(gradleModule, VanillaGradleModel::class.java) + val vgData = runReadAction { + resolverCtx.getExtraProject(gradleModule, VanillaGradleModel::class.java) + } if (vgData != null && vgData.hasVanillaGradle()) { val gradleProjectPath = gradleModule.gradleProject.projectIdentifier.projectPath val suffix = if (gradleProjectPath.endsWith(':')) "" else ":"