From 0747a4d9b7ae8da0990781e4b07dfacca9b7a9d1 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 22 Nov 2019 17:44:23 +0700 Subject: [PATCH] Fix AWT freeze in KotlinNativeABICompatibilityChecker Issue #KT-35052 --- .../kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt index bdf27d81031..0ad4e9edfd9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt @@ -14,6 +14,7 @@ import com.intellij.openapi.roots.JdkOrderEntry import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.ModuleRootManager import org.jetbrains.kotlin.caches.project.cacheInvalidatingOnRootModifications +import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.isCommon import org.jetbrains.kotlin.types.typeUtil.closure @@ -92,6 +93,6 @@ private fun mergePlatformModules( return rest + platformModules } -internal fun getAllProjectSdks(): Collection { - return ProjectJdkTable.getInstance().allJdks.toList() -} \ No newline at end of file +internal fun getAllProjectSdks(): Array = runReadAction { + ProjectJdkTable.getInstance().allJdks +}