From b7849f80c3bb36a4d1fe30dd81546e02b4efac68 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 27 May 2016 13:06:22 +0200 Subject: [PATCH] transfer to EDT (e.g. for vfs refresh) in a correct modalilty state during project loading --- .../src/com/intellij/openapi/application/actions.kt | 2 +- .../src/com/intellij/openapi/module/impl/ModuleManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/application/actions.kt b/platform/platform-impl/src/com/intellij/openapi/application/actions.kt index a3d0c858e919..3f4a0565491d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/actions.kt +++ b/platform/platform-impl/src/com/intellij/openapi/application/actions.kt @@ -44,6 +44,6 @@ fun invokeAndWaitIfNeed(runnable: () -> Unit) { if (SwingUtilities.isEventDispatchThread()) runnable() else SwingUtilities.invokeAndWait(runnable) } else { - app.invokeAndWait(runnable, ModalityState.any()) + app.invokeAndWait(runnable, ModalityState.defaultModalityState()) } } diff --git a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java index c67334dd5b53..eb8e5d0fb02a 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java @@ -744,7 +744,7 @@ public abstract class ModuleManagerImpl extends ModuleManager implements Project String path = moduleFile.getPath(); ModuleEx module = getModuleByFilePath(path); if (module == null) { - ApplicationManager.getApplication().invokeAndWait(() -> moduleFile.refresh(false, false), ModalityState.any()); + ApplicationManager.getApplication().invokeAndWait(() -> moduleFile.refresh(false, false), ModalityState.defaultModalityState()); module = createAndLoadModule(path); initModule(module, path, null); }