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

IDEA-180346 Typeahead request blocked at com.intellij.openapi.wm.impl.FocusManagerImpl.typeAheadUntil

Browse Source
This commit is contained in:
Denis Fokin
2018-01-18 18:25:50 +03:00
parent 05beabd649
commit ab8c5e7eec
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+25 -25
View File
@@ -1329,31 +1329,6 @@ public class AbstractPopup implements JBPopup {
return;
}
if (myFinalRunnable != null) {
final ActionCallback typeAheadDone = new ActionCallback();
IdeFocusManager.getInstance(myProject).typeAheadUntil(typeAheadDone);
ModalityState modalityState = ModalityState.current();
Runnable finalRunnable = myFinalRunnable;
getFocusManager().doWhenFocusSettlesDown(() -> {
//noinspection SSBasedInspection
if (ModalityState.current().equals(modalityState)) {
((TransactionGuardImpl)TransactionGuard.getInstance()).performUserActivity(finalRunnable);
} else {
System.err.println("Final runnable of popup is skipped");
}
// Otherwise the UI has changed unexpectedly and the action is likely not applicable.
// And we don't want finalRunnable to perform potentially destructive actions
// in the context of a suddenly appeared modal dialog.
});
//noinspection SSBasedInspection
SwingUtilities.invokeLater(typeAheadDone.createSetDoneRunnable());
myFinalRunnable = null;
}
debugState("dispose popup", State.INIT, State.CANCEL);
myState = State.DISPOSE;
@@ -1396,6 +1371,31 @@ public class AbstractPopup implements JBPopup {
}
myMouseOutCanceller = null;
if (myFinalRunnable != null) {
final ActionCallback typeAheadDone = new ActionCallback();
IdeFocusManager.getInstance(myProject).typeAheadUntil(typeAheadDone, "Abstract Popup Disposal");
ModalityState modalityState = ModalityState.current();
Runnable finalRunnable = myFinalRunnable;
getFocusManager().doWhenFocusSettlesDown(() -> {
//noinspection SSBasedInspection
if (ModalityState.current().equals(modalityState)) {
//noinspection SSBasedInspection
typeAheadDone.setDone();
((TransactionGuardImpl)TransactionGuard.getInstance()).performUserActivity(finalRunnable);
} else {
typeAheadDone.setRejected();
LOG.debug("Final runnable of popup is skipped");
}
// Otherwise the UI has changed unexpectedly and the action is likely not applicable.
// And we don't want finalRunnable to perform potentially destructive actions
// in the context of a suddenly appeared modal dialog.
});
myFinalRunnable = null;
}
if (LOG.isDebugEnabled()) {
LOG.debug("stop disposing content");
}