From aebc03abd07ddcc7db99d73c34bd2ea55e308d2a Mon Sep 17 00:00:00 2001 From: Liudmila Kornilova Date: Fri, 4 Oct 2024 20:58:07 +0200 Subject: [PATCH] IJPL-156861 Remove logic about modality state which is unnecessary in scanner GitOrigin-RevId: 96bbef036e12f0b56b15fb99a4d0c28c310fd35b --- .../util/indexing/UnindexedFilesScannerExecutorImpl.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt index 9a9914a52baa..fedbad6545ed 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt @@ -8,8 +8,6 @@ import com.google.common.util.concurrent.SettableFuture import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.EDT -import com.intellij.openapi.application.ModalityState -import com.intellij.openapi.application.asContextElement import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.progress.ProcessCanceledException @@ -254,12 +252,6 @@ class UnindexedFilesScannerExecutorImpl(private val project: Project, private va task as UnindexedFilesScanner LOG.debug(Throwable("submit task, ${project.name}[${project.locationHash}], thread=${Thread.currentThread()}")) - var modality = ModalityState.defaultModalityState() - if (modality == ModalityState.any()) { - LOG.error("Unexpected modality: should not be ANY. Replace with NON_MODAL") - modality = ModalityState.nonModal() - } - val historyFuture = SettableFuture.create() if (ApplicationManager.getApplication().isDispatchThread) { ApplicationManager.getApplication().runWriteAction { @@ -267,7 +259,7 @@ class UnindexedFilesScannerExecutorImpl(private val project: Project, private va } } else { - schedulingTasksScope.launch(modality.asContextElement() + Dispatchers.EDT, start = CoroutineStart.ATOMIC) { + schedulingTasksScope.launch(Dispatchers.EDT, start = CoroutineStart.ATOMIC) { try { ensureActive() blockingContext {