From 54cc2c26dcde812dd35d948d7b3e8784c933aa48 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 2 May 2016 16:15:05 +0300
Subject: [PATCH] invokeAndWait via ApplicationImpl

---
 .../git4idea/src/git4idea/util/GitFreezingProcess.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java b/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java
index d2202d791d7d..8bb24883f434 100644
--- a/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java
+++ b/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ChangeListManagerEx;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.openapi.application.ModalityState.defaultModalityState;
@@ -81,7 +80,7 @@ public class GitFreezingProcess {
 
   public void saveAndBlock() {
     myProjectManager.blockReloadingProjectOnExternalChanges();
-    myApplication.invokeAndWait(() -> FileDocumentManager.getInstance().saveAllDocuments(), defaultModalityState());
+    FileDocumentManager.getInstance().saveAllDocuments();
     mySaveAndSyncHandler.blockSaveOnFrameDeactivation();
     mySaveAndSyncHandler.blockSyncOnFrameActivation();
   }
@@ -92,7 +91,7 @@ public class GitFreezingProcess {
         saveAndBlock();
       }
     });
-    UIUtil.invokeAndWaitIfNeeded(rethrowingRunnable);
+    myApplication.invokeAndWait(rethrowingRunnable, defaultModalityState());
     rethrowingRunnable.rethrowIfHappened();
   }
 
@@ -102,7 +101,7 @@ public class GitFreezingProcess {
         unblock();
       }
     });
-    UIUtil.invokeAndWaitIfNeeded(rethrowingRunnable);
+    myApplication.invokeAndWait(rethrowingRunnable, defaultModalityState());
     rethrowingRunnable.rethrowIfHappened();
   }
 
@@ -126,7 +125,7 @@ public class GitFreezingProcess {
         unfreeze();
       }
     });
-    UIUtil.invokeAndWaitIfNeeded(rethrowingRunnable);
+    myApplication.invokeAndWait(rethrowingRunnable, defaultModalityState());
     rethrowingRunnable.rethrowIfHappened();
   }