MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Move to suspend function to improve cancellability

Browse Source 
#KTIJ-26424 Fixed

GitOrigin-RevId: 91c29ce2d887aa3291bfaa8f5138a06711d49cad
This commit is contained in:
Vladimir Dolzhenko
2023-07-31 15:08:40 +02:00
committed by intellij-monorepo-bot
parent ca108bdca5
commit 91637bb6b0
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/kotlin/performance-tests/performance-test-utils/test/org/jetbrains/kotlin/idea/performance/tests/utils/project/ProjectOpenAction.kt
View File

@@ -10,6 +10,7 @@ import com.intellij.openapi.application.runInEdt
import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManagerImpl
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.progress.runBlockingCancellable
import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ex.ProjectManagerEx
@@ -175,7 +176,7 @@ enum class ProjectOpenAction {
val checkerService = KotlinConfigurationCheckerService.getInstance(project)
val writeActionContinuations = mutableListOf<() -> Unit>()
for (module in getModulesWithKotlinFiles(project)) {
for (module in runBlockingCancellable { getModulesWithKotlinFiles(project) }) {
checkerService.getAndCacheLanguageLevelByDependencies(module, writeActionContinuations)
}
if (writeActionContinuations.isNotEmpty()) {

20
plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
View File

@@ -3,7 +3,7 @@
package org.jetbrains.kotlin.idea.configuration
import com.intellij.externalSystem.JavaModuleData
import com.intellij.openapi.application.ReadAction
import com.intellij.openapi.application.readAction
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.extensions.Extensions
@@ -12,6 +12,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleGrouper
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.progress.runBlockingMaybeCancellable
import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.guessProjectDir
@@ -48,7 +49,6 @@ import org.jetbrains.kotlin.idea.base.util.module
import org.jetbrains.kotlin.idea.base.util.projectScope
import org.jetbrains.kotlin.idea.base.util.runReadActionInSmartMode
import org.jetbrains.kotlin.idea.compiler.configuration.IdeKotlinVersion
import org.jetbrains.kotlin.idea.core.KotlinPluginDisposable
import org.jetbrains.kotlin.idea.core.syncNonBlockingReadAction
import org.jetbrains.kotlin.idea.projectConfiguration.KotlinNotConfiguredSuppressedModulesState
import org.jetbrains.kotlin.idea.projectConfiguration.KotlinProjectConfigurationBundle
@@ -145,20 +145,14 @@ fun isModuleConfigured(moduleSourceRootGroup: ModuleSourceRootGroup): Boolean {
* DO NOT CALL THIS ON AWT THREAD
*/
@RequiresBackgroundThread
fun getModulesWithKotlinFiles(project: Project, modulesWithKotlinFacets: List<Module>? = null): Collection<Module> {
suspend fun getModulesWithKotlinFiles(project: Project, modulesWithKotlinFacets: List<Module>? = null): Collection<Module> {
if (!isUnitTestMode() && isDispatchThread()) {
LOG.error("getModulesWithKotlinFiles could be a heavy operation and should not be call on AWT thread")
}
fun <T> nonBlockingReadActionSync(block: () -> T): T {
return ReadAction.nonBlocking(block)
.expireWith(KotlinPluginDisposable.getInstance(project))
.executeSynchronously()
}
val projectScope = project.projectScope()
// nothing to configure if there is no Kotlin files in entire project
val anyKotlinFileInProject = nonBlockingReadActionSync {
val anyKotlinFileInProject = readAction {
FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, projectScope)
}
if (!anyKotlinFileInProject) {
@@ -169,7 +163,7 @@ fun getModulesWithKotlinFiles(project: Project, modulesWithKotlinFacets: List<Mo
val modules =
if (modulesWithKotlinFacets.isNullOrEmpty()) {
nonBlockingReadActionSync {
readAction {
val kotlinFiles = FileTypeIndex.getFiles(KotlinFileType.INSTANCE, projectScope)
kotlinFiles.mapNotNullTo(mutableSetOf()) { ktFile: VirtualFile ->
if (projectFileIndex.isInSourceContent(ktFile)) {
@@ -180,7 +174,7 @@ fun getModulesWithKotlinFiles(project: Project, modulesWithKotlinFacets: List<Mo
} else {
// filter modules with Kotlin facet AND have at least a single Kotlin file in them
nonBlockingReadActionSync {
readAction {
modulesWithKotlinFacets.filterTo(mutableSetOf()) { module ->
if (module.isDisposed) return@filterTo false
@@ -196,7 +190,7 @@ fun getModulesWithKotlinFiles(project: Project, modulesWithKotlinFacets: List<Mo
* Note that this method is expensive and should not be called more often than strictly necessary.
*/
fun getConfigurableModulesWithKotlinFiles(project: Project): List<ModuleSourceRootGroup> {
val modules = getModulesWithKotlinFiles(project)
val modules = runBlockingMaybeCancellable { getModulesWithKotlinFiles(project) }
if (modules.isEmpty()) return emptyList()
return ModuleSourceRootMap(project).groupByBaseModules(modules)