From 72ac2db7e35478098c0505410ac76d8c83821cab Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 10 Mar 2016 14:51:01 +0100 Subject: [PATCH] EditorGutterComponentImpl: invoke actionPerformed in a transaction-aware way --- .../impl/EditorGutterComponentImpl.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java index 24f9196ea939..aa8ed9369eda 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java @@ -31,6 +31,7 @@ import com.intellij.ide.IdeEventQueue; import com.intellij.ide.dnd.*; import com.intellij.ide.ui.customization.CustomActionsSchema; import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.actionSystem.ex.ActionUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.impl.ApplicationImpl; import com.intellij.openapi.diagnostic.Logger; @@ -1570,13 +1571,8 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse : renderer.getClickAction(); } if (clickAction != null) { - if (checkDumbAware(clickAction)) { - performAction(clickAction, e, "ICON_NAVIGATION", myEditor.getDataContext()); - repaint(); - } - else { - notifyNotDumbAware(); - } + performAction(clickAction, e, "ICON_NAVIGATION", myEditor.getDataContext()); + repaint(); e.consume(); } else { @@ -1608,7 +1604,9 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse private static void performAction(@NotNull AnAction action, @NotNull InputEvent e, @NotNull String place, @NotNull DataContext context) { AnActionEvent actionEvent = AnActionEvent.createFromAnAction(action, e, place, context); action.update(actionEvent); - if (actionEvent.getPresentation().isEnabledAndVisible()) action.actionPerformed(actionEvent); + if (actionEvent.getPresentation().isEnabledAndVisible()) { + ActionUtil.performActionDumbAware(action, actionEvent); + } } @Nullable @@ -1778,11 +1776,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse else { AnAction rightButtonAction = renderer.getRightButtonClickAction(); if (rightButtonAction != null) { - if (checkDumbAware(rightButtonAction)) { - performAction(rightButtonAction, e, "ICON_NAVIGATION_SECONDARY_BUTTON", myEditor.getDataContext()); - } else { - notifyNotDumbAware(); - } + performAction(rightButtonAction, e, "ICON_NAVIGATION_SECONDARY_BUTTON", myEditor.getDataContext()); e.consume(); } }