MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Wrapped with blockingContext to avoid infinite closing project

Browse Source 
#KTIJ-26460 Fixed

GitOrigin-RevId: 2d936b258c5577df3baf472c0dfaeb5e160acbe7
This commit is contained in:
Vladimir Dolzhenko
2023-07-31 18:19:24 +00:00
committed by intellij-monorepo-bot
parent e93f89b3b4
commit bb41b95d53
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/idea/kotlin.idea.iml
+1
View File
@@ -126,5 +126,6 @@
<orderEntry type="module" module-name="kotlin.code-insight.line-markers-shared" />
<orderEntry type="module" module-name="intellij.platform.workspace.jps" />
<orderEntry type="module" module-name="intellij.platform.backend.workspace" />
<orderEntry type="module" module-name="intellij.platform.core" />
</component>
</module>
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/framework/CreateKotlinSdkActivity.kt
+7 -4
View File
@@ -3,6 +3,7 @@
package org.jetbrains.kotlin.idea.framework
import com.intellij.facet.ProjectFacetManager
import com.intellij.openapi.progress.blockingContext
import com.intellij.openapi.project.Project
import com.intellij.openapi.startup.ProjectActivity
import org.jetbrains.kotlin.idea.base.facet.platform.platform
@@ -20,10 +21,12 @@ private class CreateKotlinSdkActivity : ProjectActivity {
override suspend fun execute(project: Project) {
val modulesWithFacet = ProjectFacetManager.getInstance(project).getModulesWithFacet(KotlinFacetType.TYPE_ID)
if (modulesWithFacet.isNotEmpty()) {
KotlinSdkType.setUpIfNeeded {
modulesWithFacet.any {
val platform = it.platform
platform.isJs() || platform.isNative() || platform.isCommon()
blockingContext {
KotlinSdkType.setUpIfNeeded {
modulesWithFacet.any {
val platform = it.platform
platform.isJs() || platform.isNative() || platform.isCommon()
}
}
}
}