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

Extract action invoke with before/after callbacks in a separate method

Browse Source 
IDEA-CR-32439 (cherry picked from commit 0f19bc7)
This commit is contained in:
Svetlana.Zemlyanskaya
2018-06-18 16:02:52 +02:00
parent 1a1d9e8465
commit 57ecf4cd32
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java
+7
View File
@@ -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
platform/platform-impl/src/com/intellij/ui/popup/ActionPopupStep.java
+1 -5
View File
@@ -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);
}
}
platform/testFramework/src/com/intellij/testFramework/fixtures/EditorTestFixture.java
+1 -5
View File
@@ -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;
}