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

wait for pending filters in cmake console

Browse Source
This commit is contained in:
Anton Makeev
2016-10-27 14:32:35 +02:00
parent ca71226f81
commit 1436d11728
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/execution/impl/AsyncFilterRunner.java
+19 -7
View File
@@ -32,9 +32,7 @@ import com.intellij.util.containers.ContainerUtil;
import one.util.streamex.IntStreamEx;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -49,6 +47,7 @@ class AsyncFilterRunner {
private static final ExecutorService ourExecutor = AppExecutorUtil.createBoundedApplicationPoolExecutor("console filters", 1);
private final EditorHyperlinkSupport myHyperlinks;
private final Editor myEditor;
private final Map<AtomicBoolean, Future<FilterResults>> myPendingFilterResults = new LinkedHashMap<>();
AsyncFilterRunner(EditorHyperlinkSupport hyperlinks, Editor editor) {
myHyperlinks = hyperlinks;
@@ -71,11 +70,15 @@ class AsyncFilterRunner {
Future<FilterResults> future = ourExecutor.submit(() -> {
FilterResults results = computeWithWritePriority(bgComputation);
if (!results.myResults.isEmpty()) {
ApplicationManager.getApplication().invokeLater(() -> results.applyHighlights(myHyperlinks), ModalityState.any(), o -> handled.get());
ApplicationManager.getApplication().invokeLater(() -> {
results.applyHighlights(myHyperlinks);
myPendingFilterResults.remove(handled);
}, ModalityState.any(), o -> handled.get());
}
return results;
});
handleSynchronouslyIfQuick(handled, future);
myPendingFilterResults.put(handled, future);
handleSynchronouslyIfQuick(handled, future, 5);
}
@NotNull
@@ -91,10 +94,11 @@ class AsyncFilterRunner {
return applyResults.get();
}
private void handleSynchronouslyIfQuick(AtomicBoolean handled, Future<FilterResults> future) {
private void handleSynchronouslyIfQuick(AtomicBoolean handled, Future<FilterResults> future, int timeout) {
try {
future.get(5, TimeUnit.MILLISECONDS).applyHighlights(myHyperlinks);
future.get(timeout, TimeUnit.MILLISECONDS).applyHighlights(myHyperlinks);
handled.set(true);
myPendingFilterResults.remove(handled);
}
catch (TimeoutException ignored) {
}
@@ -102,6 +106,14 @@ class AsyncFilterRunner {
throw new RuntimeException(e);
}
}
public void waitForPendingFilters() {
ApplicationManager.getApplication().assertIsDispatchThread();
while(!myPendingFilterResults.isEmpty()) {
Map.Entry<AtomicBoolean, Future<FilterResults>> next = myPendingFilterResults.entrySet().iterator().next();
handleSynchronouslyIfQuick(next.getKey(), next.getValue(), 1000);
}
}
@NotNull
private Computable<FilterResults> highlightHyperlinksAsync(Filter filter, int startLine, int endLine) {
platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java
+4
View File
@@ -110,6 +110,10 @@ public class EditorHyperlinkSupport {
}
}
public void waitForPendingFilters() {
myFilterRunner.waitForPendingFilters();
}
@Deprecated
public Map<RangeHighlighter, HyperlinkInfo> getHyperlinks() {
LinkedHashMap<RangeHighlighter, HyperlinkInfo> result = new LinkedHashMap<>();