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

goto action: invoke the action after the popup is closed (otherwise e.g. Show Color Picker disappears immediately)

Browse Source
This commit is contained in:
peter
2016-05-30 22:07:52 +02:00
parent f0edfe6027
commit 458ebe771d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+2 -2
View File
@@ -239,7 +239,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
@Nullable AnActionEvent e) { @Nullable AnActionEvent e) {
if (element instanceof OptionDescription) { if (element instanceof OptionDescription) {
final String configurableId = ((OptionDescription)element).getConfigurableId(); final String configurableId = ((OptionDescription)element).getConfigurableId();
TransactionGuard.submitTransaction(project, () -> TransactionGuard.getInstance().submitTransactionLater(project, () ->
ShowSettingsUtilImpl.showSettingsDialog(project, configurableId, enteredText)); ShowSettingsUtilImpl.showSettingsDialog(project, configurableId, enteredText));
} }
else { else {
@@ -251,7 +251,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
// element could be AnAction (SearchEverywhere) // element could be AnAction (SearchEverywhere)
if (component == null) return; if (component == null) return;
final AnAction action = element instanceof AnAction ? (AnAction)element : ((GotoActionModel.ActionWrapper)element).getAction(); final AnAction action = element instanceof AnAction ? (AnAction)element : ((GotoActionModel.ActionWrapper)element).getAction();
TransactionGuard.submitTransaction(ApplicationManager.getApplication(), () -> { TransactionGuard.getInstance().submitTransactionLater(ApplicationManager.getApplication(), () -> {
DataManager instance = DataManager.getInstance(); DataManager instance = DataManager.getInstance();
DataContext context = instance != null ? instance.getDataContext(component) : DataContext.EMPTY_CONTEXT; DataContext context = instance != null ? instance.getDataContext(component) : DataContext.EMPTY_CONTEXT;
InputEvent inputEvent = e == null ? null : e.getInputEvent(); InputEvent inputEvent = e == null ? null : e.getInputEvent();