From 458ebe771d20d1defbb095e7ea65eeecb186eab1 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 30 May 2016 21:58:12 +0200 Subject: [PATCH] goto action: invoke the action after the popup is closed (otherwise e.g. Show Color Picker disappears immediately) --- .../src/com/intellij/ide/actions/GotoActionAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java index 896f104fe070..3ad3ec9219f3 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java @@ -239,7 +239,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware { @Nullable AnActionEvent e) { if (element instanceof OptionDescription) { final String configurableId = ((OptionDescription)element).getConfigurableId(); - TransactionGuard.submitTransaction(project, () -> + TransactionGuard.getInstance().submitTransactionLater(project, () -> ShowSettingsUtilImpl.showSettingsDialog(project, configurableId, enteredText)); } else { @@ -251,7 +251,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware { // element could be AnAction (SearchEverywhere) if (component == null) return; 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(); DataContext context = instance != null ? instance.getDataContext(component) : DataContext.EMPTY_CONTEXT; InputEvent inputEvent = e == null ? null : e.getInputEvent();