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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Alexander Marchuk
2014-11-06 18:55:00 +03:00
parent 9848142104 683301ebaf
commit 6db4766e9f
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+4
View File
@@ -1192,6 +1192,10 @@ public abstract class ChooseByNameBase {
myPostponedOkAction = null;
}
public boolean hasPostponedAction() {
return myPostponedOkAction != null;
}
protected abstract void showList();
protected abstract void hideList();
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/GotoTaskAction.java
-1
View File
@@ -54,7 +54,6 @@ public class GotoTaskAction extends GotoActionBase implements DumbAware {
popup.setShowListForEmptyPattern(true);
popup.setSearchInAnyPlace(true);
popup.setFixLostTyping(false);
popup.setAlwaysHasMore(true);
popup.setAdText("<html>Press SHIFT to merge with current context<br/>" +
"Pressing " +
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskItemProvider.java
+18 -6
View File
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReference;
class TaskItemProvider implements ChooseByNameItemProvider, Disposable {
private static final Logger LOG = Logger.getInstance(TaskItemProvider.class);
private static final int DELAY_PERIOD = 1000; // ms
private static final int DELAY_PERIOD = 200; // ms
private final Project myProject;
@@ -76,19 +76,31 @@ class TaskItemProvider implements ChooseByNameItemProvider, Disposable {
});
// Newer request always wins
Future<List<Task>> oldFeature = myFutureReference.getAndSet(future);
if (oldFeature != null) {
Future<List<Task>> oldFuture = myFutureReference.getAndSet(future);
if (oldFuture != null) {
LOG.debug("Cancelling existing task");
oldFeature.cancel(true);
oldFuture.cancel(true);
}
if (myAlarm.isDisposed()) {
return false;
}
myAlarm.addRequest(future, DELAY_PERIOD);
myAlarm.addRequest(future, oldFuture == null && pattern.length() > 5 ? 0 : DELAY_PERIOD);
try {
List<Task> tasks = future.get();
List<Task> tasks;
while (true) {
try {
tasks = future.get(10, TimeUnit.MILLISECONDS);
break;
}
catch (TimeoutException ignore) {
}
if (base.hasPostponedAction()) {
future.cancel(true);
return true;
}
}
myFutureReference.compareAndSet(future, null);
// Exclude *all* cached and local issues, not only those returned by TaskSearchSupport.getLocalAndCachedTasks().