diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/Presentation.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/Presentation.java index 2ce0bf6bee32..274bf3e4d1b1 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/Presentation.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/Presentation.java @@ -334,4 +334,9 @@ public final class Presentation implements Cloneable { public void setWeight(double weight) { myWeight = weight; } + + @Override + public String toString() { + return myText + " (" + myDescription + ")"; + } } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java index 02f158832117..100a8996ab85 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java @@ -178,8 +178,11 @@ public class Utils{ private static boolean hasVisibleChildren(ActionGroup group, PresentationFactory factory, DataContext context, String place) { AnActionEvent event = new AnActionEvent(null, context, place, factory.getPresentation(group), ActionManager.getInstance(), 0); event.setInjectedContext(group.isInInjectedContext()); - AnAction[] children = group.getChildren(event); - for (AnAction anAction : children) { + for (AnAction anAction : group.getChildren(event)) { + if (anAction == null) { + LOG.error("Null action found in group " + group + ", " + factory.getPresentation(group)); + continue; + } if (anAction instanceof Separator) { continue; } @@ -188,8 +191,6 @@ public class Utils{ continue; } - LOG.assertTrue(anAction != null, "Null action found in group " + group); - final Presentation presentation = factory.getPresentation(anAction); updateGroupChild(context, place, anAction, presentation); if (anAction instanceof ActionGroup) {