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

avoid action instantiation if possible and log it 6

Browse Source 
Restore the previous stub-based logic since `ActionsTreeUtil.getTemplatePresentation` is used everywhere and can unstub an action if needed.

IJPL-936 T: LoadingState.logStateError from ActionManagerImplKt.instantiate
EA-1008831 - T: LoadingState.logStateError

GitOrigin-RevId: 9b499397bd3152d6e6baaebc5fced308dfd83bf5
This commit is contained in:
Gregory.Shrago
2024-04-11 04:23:59 +00:00
committed by intellij-monorepo-bot
parent 9166c5c440
commit 71a9de3dd3
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
+16 -11
View File
@@ -92,7 +92,7 @@ public final class ActionsTreeUtil {
return Objects.requireNonNullElse(getTemplatePresentation(stub.getId(), null), presentation);
}
else {
return action.getTemplatePresentation();
return presentation;
}
}
@@ -224,8 +224,10 @@ public final class ActionsTreeUtil {
}
public static Group createGroup(ActionGroup actionGroup, boolean forceAsPopup, Condition<? super AnAction> filtered) {
String groupName = getName(actionGroup);
return createGroup(actionGroup, groupName, getTemplatePresentation(actionGroup).getIconSupplier(), forceAsPopup, filtered, true);
Presentation presentation = getTemplatePresentation(actionGroup);
String text = presentation.getText();
String groupName = StringUtil.isNotEmpty(text) ? text : getName(actionGroup);
return createGroup(actionGroup, groupName, presentation.getIconSupplier(), forceAsPopup, filtered, true);
}
public static @NlsActions.ActionText String getName(@NotNull AnAction action) {
@@ -766,21 +768,24 @@ public final class ActionsTreeUtil {
private static AnAction @NotNull [] getActions(@NotNull ActionGroup group, @NotNull ActionManager actionManager) {
try {
if (group instanceof ActionGroupStub) {
AnAction[] stubChildren = ((DefaultActionGroup)group).getChildActionsOrStubs();
if (group instanceof ActionGroupStub stub) {
AnAction[] stubChildren = stub.getChildActionsOrStubs();
if (stubChildren.length > 0) return stubChildren;
String actionId = ((ActionGroupStub)group).getId();
AnAction action = actionManager.getAction(actionId);
if (action instanceof ActionGroup) {
LOG.info("No children in '" + actionId + "' stub. Creating its instance");
return group.getChildren(null);
String actionId = stub.getId();
LOG.info("No children in '" + actionId + "' stub. Creating its instance");
AnAction unstubbed = actionManager.getAction(actionId);
if (unstubbed instanceof ActionGroup g && !(unstubbed instanceof ActionGroupStub)) {
return getActions(g, actionManager);
}
else {
PluginException.logPluginError(LOG, "'" + actionId + "' is not an action group. " +
action.getClass().getName(), null, action.getClass());
unstubbed.getClass().getName(), null, unstubbed.getClass());
return AnAction.EMPTY_ARRAY;
}
}
else if (group instanceof DefaultActionGroup g && ActionClassMetaData.isDefaultGetChildren(g)) {
return g.getChildActionsOrStubs();
}
else {
return group.getChildren(null);
}