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

[CWM-3862] Preserve action registration order during replacement

Browse Source 
GitOrigin-RevId: d331ada7563425bbe79349133a3357d7418a5cc4
This commit is contained in:
Aleksandr Rasnyuk
2021-11-02 15:51:29 +00:00
committed by intellij-monorepo-bot
parent cac8c334aa
commit 9d92d609d7
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+4
View File
@@ -1455,6 +1455,7 @@ public class ActionManagerImpl extends ActionManagerEx implements Disposable {
}
AnAction oldAction = newAction instanceof OverridingAction ? getAction(actionId) : getActionOrStub(actionId);
int oldIndex = idToIndex.getOrDefault(actionId, -1); // Valid indices >= 0
if (oldAction != null) {
if (newAction instanceof OverridingAction) {
myBaseActions.put((OverridingAction)newAction, oldAction);
@@ -1473,6 +1474,9 @@ public class ActionManagerImpl extends ActionManagerEx implements Disposable {
unregisterAction(actionId, false);
}
registerAction(actionId, newAction, pluginId);
if (oldIndex >= 0) {
idToIndex.put(actionId, oldIndex);
}
return oldAction;
}