From a317ab473c968bae95599a1bc9673b13c9e57eae Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 20 Jul 2023 13:25:49 +0200 Subject: [PATCH] fix usage preview missing from rename refactoring additional rename dialog (IDEA-324363) fix provided by Gregory.Shrago GitOrigin-RevId: 139a65ce3e3d297eed92143e43cfeaf0d9188261 --- .../src/com/intellij/usages/impl/UsagePreviewPanel.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/usageView-impl/src/com/intellij/usages/impl/UsagePreviewPanel.kt b/platform/usageView-impl/src/com/intellij/usages/impl/UsagePreviewPanel.kt index d2b5df6eb1ca..941ee38d1e90 100644 --- a/platform/usageView-impl/src/com/intellij/usages/impl/UsagePreviewPanel.kt +++ b/platform/usageView-impl/src/com/intellij/usages/impl/UsagePreviewPanel.kt @@ -14,6 +14,8 @@ import com.intellij.openapi.actionSystem.DataProvider import com.intellij.openapi.actionSystem.PlatformCoreDataKeys 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.application.readAction import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.editor.* @@ -129,7 +131,7 @@ open class UsagePreviewPanel @JvmOverloads constructor(project: Project, psiFile to document } ?: return - withContext(Dispatchers.EDT) { + withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) { val (psiFile, document) = pair if (myEditor == null || document !== myEditor!!.document) { @@ -298,7 +300,7 @@ open class UsagePreviewPanel @JvmOverloads constructor(project: Project, resetEditor(infos!!) } else { - withContext(Dispatchers.EDT) { + withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) { releaseEditor() removeAll() val newLineIndex = cannotPreviewMessage.indexOf('\n')