From b709a88f528cf31371802e990f5bde67a2fc1fd2 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 27 Jul 2017 02:15:25 +0300
Subject: [PATCH] IDEA-CR-23165 keep the new action in the original groups

---
 .../openapi/actionSystem/impl/ActionManagerImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
index 33219c2df509..f2280adf83a4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
@@ -1121,16 +1121,16 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
       if (isGroup != newAction instanceof ActionGroup) {
         throw new IllegalStateException("cannot replace a group with an action and vice versa: " + actionId);
       }
+      for (String groupId : myId2GroupId.get(actionId)) {
+        DefaultActionGroup group = ObjectUtils.assertNotNull((DefaultActionGroup)getActionOrStub(groupId));
+        group.replaceAction(oldAction, newAction);
+      }
       unregisterAction(actionId);
       if (isGroup) {
         myId2GroupId.values().remove(actionId);
       }
     }
     registerAction(actionId, newAction, pluginId);
-    for (String groupId : myId2GroupId.get(actionId)) {
-      DefaultActionGroup group = ObjectUtils.assertNotNull((DefaultActionGroup)getActionOrStub(groupId));
-      group.replaceAction(oldAction, newAction);
-    }
     return oldAction;
   }