From 57ecf4cd32bda04e7c165b512e6119969557f7a4 Mon Sep 17 00:00:00 2001
From: "Svetlana.Zemlyanskaya" <svetlana.zemlyanskaya@jetbrains.com>
Date: Tue, 8 May 2018 10:20:43 +0200
Subject: [PATCH] Extract action invoke with before/after callbacks in a
 separate method

IDEA-CR-32439 (cherry picked from commit 0f19bc7)
---
 .../com/intellij/openapi/actionSystem/ex/ActionUtil.java   | 7 +++++++
 .../src/com/intellij/ui/popup/ActionPopupStep.java         | 6 +-----
 .../intellij/testFramework/fixtures/EditorTestFixture.java | 6 +-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java
index e0b6060379b6..015f3f7dfec1 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java
@@ -212,6 +212,13 @@ public class ActionUtil {
     return true;
   }
 
+  public static void performActionDumbAwareWithCallbacks(AnAction action, AnActionEvent e, DataContext context) {
+    final ActionManagerEx manager = ActionManagerEx.getInstanceEx();
+    manager.fireBeforeActionPerformed(action, context, e);
+    performActionDumbAware(action, e);
+    manager.fireAfterActionPerformed(action, context, e);
+  }
+
   public static void performActionDumbAware(AnAction action, AnActionEvent e) {
     Runnable runnable = new Runnable() {
       @Override
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/ActionPopupStep.java b/platform/platform-impl/src/com/intellij/ui/popup/ActionPopupStep.java
index 7d0f9ec62fac..8024c99607c7 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/ActionPopupStep.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/ActionPopupStep.java
@@ -2,7 +2,6 @@
 package com.intellij.ui.popup;
 
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
 import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.ui.popup.*;
 import com.intellij.openapi.util.Condition;
@@ -198,10 +197,7 @@ public class ActionPopupStep implements ListPopupStepEx<PopupFactoryImpl.ActionI
       ActionManager.getInstance(), modifiers);
     event.setInjectedContext(action.isInInjectedContext());
     if (ActionUtil.lastUpdateAndCheckDumb(action, event, false)) {
-      final ActionManagerEx manager = ActionManagerEx.getInstanceEx();
-      manager.fireBeforeActionPerformed(action, dataContext, event);
-      ActionUtil.performActionDumbAware(action, event);
-      manager.fireAfterActionPerformed(action, dataContext, event);
+      ActionUtil.performActionDumbAwareWithCallbacks(action, event, dataContext);
     }
   }
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorTestFixture.java
index acf9be8dc9dd..25295481745d 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorTestFixture.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/EditorTestFixture.java
@@ -129,11 +129,7 @@ public class EditorTestFixture {
       return false;
     }
 
-    managerEx.fireBeforeActionPerformed(action, dataContext, event);
-
-    ActionUtil.performActionDumbAware(action, event);
-
-    managerEx.fireAfterActionPerformed(action, dataContext, event);
+    ActionUtil.performActionDumbAwareWithCallbacks(action, event, dataContext);
     return true;
   }