use async document commit in file opening startup activity

JetBrains · Apr 21, 2016 · 8a035e0 · 8a035e0
1 parent 62fa0ee
commit 8a035e0
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
@@ -63,6 +63,7 @@
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.ex.StatusBarEx;
 import com.intellij.openapi.wm.impl.IdeFrameImpl;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.reference.SoftReference;
 import com.intellij.ui.FocusTrackback;
 import com.intellij.ui.docking.DockContainer;
@@ -71,6 +72,7 @@
 import com.intellij.ui.tabs.impl.JBTabsImpl;
 import com.intellij.util.Function;
 import com.intellij.util.SmartList;
+import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.messages.impl.MessageListenerList;
@@ -873,7 +875,7 @@ public AsyncFileEditorProvider.Builder compute() {
       newProviders = null;
       builders = null;
     }
-    UIUtil.invokeAndWaitIfNeeded(new Runnable() {
+    Runnable runnable = new Runnable() {
       @Override
       public void run() {
         if (myProject.isDisposed() || !file.isValid()) {
@@ -991,7 +993,25 @@ public void run() {
           window.setFilePinned(file, pin);
         }
       }
-    });
+    };
+
+    if (ApplicationManager.getApplication().isDispatchThread()) {
+      PsiDocumentManager.getInstance(myProject).commitAllDocuments();
+      runnable.run();
+    } else {
+      Semaphore semaphore = new Semaphore();
+      semaphore.down();
+      PsiDocumentManager.getInstance(myProject).performLaterWhenAllCommitted(() -> {
+        try {
+          runnable.run();
+        } finally {
+          semaphore.up();
+        }
+      });
+      //noinspection StatementWithEmptyBody
+      while (!semaphore.waitFor(10) && !myProject.isDisposed());
+    }
+
     EditorWithProviderComposite composite = compositeRef.get();
     return Pair.create(composite == null ? EMPTY_EDITOR_ARRAY : composite.getEditors(),
                        composite == null ? EMPTY_PROVIDER_ARRAY : composite.getProviders());