vcs: use short form of application.invokeAndWait

platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java

@@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -527,7 +526,7 @@ public class VcsUtil {
       }
     };
 
-    app.invokeAndWait(action, ModalityState.defaultModalityState());
+    app.invokeAndWait(action);
 
     return file[0];
   }

platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java

@@ -20,7 +20,6 @@ import com.intellij.concurrency.JobScheduler;
 import com.intellij.lifecycle.PeriodicalTasksCloser;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.impl.LaterInvocator;
 import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.components.PathMacroManager;
@@ -607,7 +606,7 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
           }
         }
       }
-    }, ModalityState.defaultModalityState());
+    });
   }
 
   private static List<TextFilePatch> loadTextPatches(final Project project,

platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java

@@ -23,7 +23,6 @@ import com.intellij.ide.CopyProvider;
 import com.intellij.ide.actions.RefreshAction;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.diagnostic.Logger;
@@ -486,7 +485,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme
       mySplitter.repaint();
 
       myRefresherI.run(true, canUseLastRevisionCheck);
-    }, ModalityState.defaultModalityState());
+    });
   }
 
   @NotNull

platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistorySessionPartner.java

@@ -16,7 +16,6 @@
 package com.intellij.openapi.vcs.history;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.vcs.AbstractVcs;
@@ -69,8 +68,7 @@ public class FileHistorySessionPartner implements VcsAppendableHistorySessionPar
       // TODO: Logic should be revised to just append some revisions to history panel instead of creating and showing new history session
       mySession.getRevisionList().addAll(vcsFileRevisions);
       VcsHistorySession copy = mySession.copyWithCachedRevision();
-      ApplicationManager.getApplication().invokeAndWait(() -> ensureHistoryPanelCreated().getHistoryPanelRefresh().consume(copy),
-                                                        ModalityState.defaultModalityState());
+      ApplicationManager.getApplication().invokeAndWait(() -> ensureHistoryPanelCreated().getHistoryPanelRefresh().consume(copy));
     };
     myBuffer = new BufferedListConsumer<VcsFileRevision>(5, sessionRefresher, 1000) {
       @Override
@@ -129,7 +127,7 @@ public class FileHistorySessionPartner implements VcsAppendableHistorySessionPar
       else if (session != null && !session.getRevisionList().isEmpty()){
         myFileHistoryPanel.getHistoryPanelRefresh().consume(copy);
       }
-    }, ModalityState.defaultModalityState());
+    });
   }
 
   @NotNull
@@ -184,7 +182,7 @@ public class FileHistorySessionPartner implements VcsAppendableHistorySessionPar
         return;
       }
       ensureHistoryPanelCreated().getHistoryPanelRefresh().finished();
-    }, ModalityState.defaultModalityState());
+    });
   }
 
   @Override
@@ -195,6 +193,6 @@ public class FileHistorySessionPartner implements VcsAppendableHistorySessionPar
         return;
       }
       ensureHistoryPanelCreated().scheduleRefresh(false);
-    }, ModalityState.defaultModalityState());
+    });
   }
 }

plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java

@@ -222,7 +222,7 @@ public class CvsOperationExecutor {
     if (myProject != null && myProject.isDefault()) return null;
     if (myProject != null) {
       if (myConfiguration != null && myConfiguration.SHOW_OUTPUT && !myIsQuietOperation) {
-        ApplicationManager.getApplication().invokeAndWait(() -> connectToOutput(output), ModalityState.defaultModalityState());
+        ApplicationManager.getApplication().invokeAndWait(() -> connectToOutput(output));
       }
       if (!myProject.isDisposed()) {
         return CvsTabbedWindow.getInstance(myProject);

plugins/git4idea/src/git4idea/branch/GitBranchOperation.java

@@ -41,7 +41,6 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
-import static com.intellij.openapi.application.ModalityState.defaultModalityState;
 import static com.intellij.openapi.util.text.StringUtil.pluralize;
 import static com.intellij.util.ObjectUtils.chooseNotNull;
 
@@ -183,8 +182,8 @@ abstract class GitBranchOperation {
     notifySuccess(getSuccessMessage());
   }
 
-  protected final void saveAllDocuments() {
-    ApplicationManager.getApplication().invokeAndWait(() -> FileDocumentManager.getInstance().saveAllDocuments(), defaultModalityState());
+  protected static void saveAllDocuments() {
+    ApplicationManager.getApplication().invokeAndWait(() -> FileDocumentManager.getInstance().saveAllDocuments());
   }
 
   /**

plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java

@@ -18,7 +18,6 @@ package git4idea.branch;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
@@ -153,8 +152,7 @@ public class GitBranchUiHandlerImpl implements GitBranchUiHandler {
                                                   @NotNull String removedBranch) {
     AtomicBoolean restore = new AtomicBoolean();
     ApplicationManager.getApplication().invokeAndWait(() -> restore.set(
-      GitBranchIsNotFullyMergedDialog.showAndGetAnswer(myProject, history, baseBranches, removedBranch)),
-      ModalityState.defaultModalityState());
+      GitBranchIsNotFullyMergedDialog.showAndGetAnswer(myProject, history, baseBranches, removedBranch)));
     return restore.get();
   }
 

plugins/git4idea/src/git4idea/branch/GitSmartOperationDialog.java

@@ -17,7 +17,6 @@ package git4idea.branch;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ApplicationNamesInfo;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.ui.IdeBorderFactory;
@@ -57,7 +56,7 @@ public class GitSmartOperationDialog extends DialogWrapper {
       GitSmartOperationDialog dialog = new GitSmartOperationDialog(project, fileBrowser, operationTitle, forceButtonTitle);
       DialogManager.show(dialog);
       exitCode.set(dialog.getExitCode());
-    }, ModalityState.defaultModalityState());
+    });
     return exitCode.get();
   }
 

plugins/git4idea/src/git4idea/commands/GitTask.java

@@ -18,7 +18,6 @@ package git4idea.commands;
 import com.intellij.concurrency.JobScheduler;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
@@ -126,12 +125,7 @@ public class GitTask {
           completed.set(true);
         }
       };
-      ApplicationManager.getApplication().invokeAndWait(new Runnable() {
-        @Override
-        public void run() {
-          ProgressManager.getInstance().run(task);
-        }
-      }, ModalityState.defaultModalityState());
+      ApplicationManager.getApplication().invokeAndWait(() -> ProgressManager.getInstance().run(task));
     } else {
       final BackgroundableTask task = new BackgroundableTask(myProject, myHandler, myTitle) {
         @Override public void onSuccess() {

plugins/git4idea/src/git4idea/merge/GitConflictResolver.java

@@ -18,7 +18,6 @@ package git4idea.merge;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
@@ -235,7 +234,7 @@ public class GitConflictResolver {
     ApplicationManager.getApplication().invokeAndWait(() -> {
       MergeProvider mergeProvider = new GitMergeProvider(myProject, myParams.reverse);
       myVcsHelper.showMergeDialog(new ArrayList<>(initiallyUnmergedFiles), mergeProvider, myParams.myMergeDialogCustomizer);
-    }, ModalityState.defaultModalityState());
+    });
   }
 
   private void notifyException(VcsException e) {

plugins/git4idea/src/git4idea/rebase/GitAbortRebaseProcess.java

@@ -18,7 +18,6 @@ package git4idea.rebase;
 import com.intellij.dvcs.DvcsUtil;
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -83,12 +82,7 @@ class GitAbortRebaseProcess {
     LOG.info("Abort rebase. " + (myRepositoryToAbort == null ? "Nothing to abort" : getShortRepositoryName(myRepositoryToAbort)) +
               ". Roots to rollback: " + DvcsUtil.joinShortNames(myRepositoriesToRollback.keySet()));
     final Ref<AbortChoice> ref = Ref.create();
-    ApplicationManager.getApplication().invokeAndWait(new Runnable() {
-      @Override
-      public void run() {
-        ref.set(confirmAbort());
-      }
-    }, ModalityState.defaultModalityState());
+    ApplicationManager.getApplication().invokeAndWait(() -> ref.set(confirmAbort()));
 
     LOG.info("User choice: " + ref.get());
     if (ref.get() == AbortChoice.ROLLBACK_AND_ABORT) {

plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java

@@ -17,7 +17,6 @@ package git4idea.rebase;
 
 import com.intellij.CommonBundle;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
@@ -166,7 +165,7 @@ public class GitInteractiveRebaseEditorHandler implements Closeable, GitRebaseEd
         }
         isSuccess.set(false);
       }
-    }, ModalityState.defaultModalityState());
+    });
     return (isSuccess.isNull() || !isSuccess.get().booleanValue()) ? GitRebaseEditorMain.ERROR_EXIT_CODE : 0;
   }
 

plugins/git4idea/src/git4idea/reset/GitResetOperation.java

@@ -18,7 +18,6 @@ package git4idea.reset;
 import com.intellij.dvcs.DvcsUtil;
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -186,8 +185,7 @@ public class GitResetOperation {
   }
 
   private static void saveAllDocuments() {
-    ApplicationManager.getApplication().invokeAndWait(() -> FileDocumentManager.getInstance().saveAllDocuments(),
-                                                      ModalityState.defaultModalityState());
+    ApplicationManager.getApplication().invokeAndWait(() -> FileDocumentManager.getInstance().saveAllDocuments());
   }
 
 }

plugins/git4idea/src/git4idea/reset/GitUncommitAction.java

@@ -229,7 +229,7 @@ public class GitUncommitAction extends DumbAwareAction {
     Ref<VcsFullCommitDetails> details = Ref.create();
     ApplicationManager.getApplication().invokeAndWait(() -> {
       details.set(data.getCommitDetailsGetter().getCommitDataIfAvailable(data.getCommitIndex(hash, root)));
-    }, ModalityState.defaultModalityState());
+    });
     if (details.isNull() || details.get() instanceof LoadingDetails) return null;
     return details.get();
   }

plugins/git4idea/src/git4idea/stash/GitShelveUtils.java

@@ -16,7 +16,6 @@
 package git4idea.stash;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.command.impl.UndoManagerImpl;
 import com.intellij.openapi.command.undo.DocumentReference;
 import com.intellij.openapi.command.undo.DocumentReferenceManager;
@@ -72,7 +71,7 @@ public class GitShelveUtils {
       public void run() {
         markUnshelvedFilesNonUndoable(project, changes);
       }
-    }, ModalityState.defaultModalityState());
+    });
   }
 
   @CalledInAwt

plugins/git4idea/src/git4idea/update/GitRebaseOverMergeProblem.java

@@ -17,7 +17,6 @@ package git4idea.update;
 
 import com.intellij.CommonBundle;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
@@ -112,12 +111,7 @@ public class GitRebaseOverMergeProblem {
   @NotNull
   public static Decision showDialog() {
     final Ref<Decision> decision = Ref.create();
-    ApplicationManager.getApplication().invokeAndWait(new Runnable() {
-      @Override
-      public void run() {
-        decision.set(doShowDialog());
-      }
-    }, ModalityState.defaultModalityState());
+    ApplicationManager.getApplication().invokeAndWait(() -> decision.set(doShowDialog()));
     return decision.get();
   }
 

plugins/git4idea/src/git4idea/util/GitFreezingProcess.java

@@ -26,8 +26,6 @@ import com.intellij.openapi.vcs.changes.ChangeListManagerEx;
 import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
 import org.jetbrains.annotations.NotNull;
 
-import static com.intellij.openapi.application.ModalityState.defaultModalityState;
-
 /**
  * Executes an action surrounding it with freezing-unfreezing of the ChangeListManager
  * and blocking/unblocking save/sync on frame de/activation.
@@ -82,7 +80,7 @@ public class GitFreezingProcess {
       FileDocumentManager.getInstance().saveAllDocuments();
       mySaveAndSyncHandler.blockSaveOnFrameDeactivation();
       mySaveAndSyncHandler.blockSyncOnFrameActivation();
-    }, defaultModalityState());
+    });
   }
 
   private void unblockInAwt() {
@@ -90,7 +88,7 @@ public class GitFreezingProcess {
       myProjectManager.unblockReloadingProjectOnExternalChanges();
       mySaveAndSyncHandler.unblockSaveOnFrameDeactivation();
       mySaveAndSyncHandler.unblockSyncOnFrameActivation();
-    }, defaultModalityState());
+    });
   }
 
   private void freeze() {

plugins/git4idea/src/git4idea/util/GitUntrackedFilesHelper.java

@@ -18,7 +18,6 @@ package git4idea.util;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.MultiLineLabelUI;
@@ -147,7 +146,7 @@ public class GitUntrackedFilesHelper {
         DialogManager.show(dialog);
         rollback.set(dialog.isOK());
       }
-    }, ModalityState.defaultModalityState());
+    });
     return rollback.get();
   }
 

plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java

@@ -253,11 +253,7 @@ public class HgVFSListener extends VcsVFSListener {
           }
           else {
             final AtomicReference<Collection<FilePath>> filePaths = new AtomicReference<>();
-            ApplicationManager.getApplication().invokeAndWait(new Runnable() {
-                @Override public void run() {
-                  filePaths.set(selectFilePathsToDelete(filesToConfirmDeletion));
-                }
-              }, indicator.getModalityState());
+            ApplicationManager.getApplication().invokeAndWait(() -> filePaths.set(selectFilePathsToDelete(filesToConfirmDeletion)));
             if (filePaths.get() != null) {
               filesToDelete.addAll(filePaths.get());
             }

plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java

@@ -15,7 +15,6 @@ package org.zmlx.hg4idea.provider.commit;
 import com.intellij.dvcs.AmendComponent;
 import com.intellij.dvcs.push.ui.VcsPushDialog;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
@@ -210,7 +209,7 @@ public class HgCheckinEnvironment implements CheckinEnvironment {
         );
       }
     };
-    ApplicationManager.getApplication().invokeAndWait(runnable, ModalityState.defaultModalityState());
+    ApplicationManager.getApplication().invokeAndWait(runnable);
     return choice[0] == Messages.OK;
   }
 

plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java

@@ -13,7 +13,6 @@
 package org.zmlx.hg4idea.provider.update;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vcs.AbstractVcsHelper;
@@ -72,7 +71,7 @@ public final class HgConflictResolver {
       public void run() {
         AbstractVcsHelper.getInstance(myProject).showMergeDialog(conflicts, vcs.getMergeProvider());
       }
-    }, ModalityState.defaultModalityState());
+    });
   }
 
   private void updateUpdatedFiles(@NotNull File file, boolean unresolved) {