MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

give Changes View threads a chance to invokeAndWait, e.g. for VFS refresh events (ChangeListManagerImpl.waitEverythingDoneInTestMode)

Browse Source
This commit is contained in:
peter
2016-04-06 08:37:26 +02:00
parent 15f4933c6b
commit 22e0c97e75
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+11 -7
View File
@@ -57,6 +57,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.continuation.ContinuationPause;
import com.intellij.util.messages.Topic;
import com.intellij.util.ui.UIUtil;
import com.intellij.vcsUtil.VcsUtil;
import org.jdom.Element;
import org.jetbrains.annotations.CalledInAwt;
@@ -65,10 +66,7 @@ import org.jetbrains.annotations.*;
import javax.swing.*;
import java.io.File;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
/**
@@ -1684,10 +1682,14 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
@TestOnly
public void waitEverythingDoneInTestMode() {
assert ApplicationManager.getApplication().isUnitTestMode();
Future future = ourUpdateAlarm.get();
if (future != null) {
while (true) {
Future future = ourUpdateAlarm.get();
if (future == null) break;
UIUtil.dispatchAllInvocationEvents();
try {
future.get();
future.get(10, TimeUnit.MILLISECONDS);
break;
}
catch (InterruptedException e) {
LOG.error(e);
@@ -1695,6 +1697,8 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
catch (ExecutionException e) {
LOG.error(e);
}
catch (TimeoutException ignore) {
}
}
}