From 88a99ff444f1d25e73553e6a7f8a1d0c1a69dc08 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 27 Sep 2017 00:59:30 +0300 Subject: [PATCH] IDEA-179577 fix NPE --- .../ide/actions/SearchEverywhereAction.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java index 3b829c688352..59f2b52a4ba7 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java @@ -1953,13 +1953,14 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA } protected boolean isEnabled(final AnAction action) { - if (myDisabledActions.contains(action)) return false; - final AnActionEvent e = new AnActionEvent(myActionEvent.getInputEvent(), - myActionEvent.getDataContext(), - myActionEvent.getPlace(), + AnActionEvent event = myActionEvent; + if (myDisabledActions.contains(action) || event == null) return false; + final AnActionEvent e = new AnActionEvent(event.getInputEvent(), + event.getDataContext(), + event.getPlace(), action.getTemplatePresentation().clone(), - myActionEvent.getActionManager(), - myActionEvent.getModifiers()); + event.getActionManager(), + event.getModifiers()); ApplicationManager.getApplication().invokeAndWait(() -> ActionUtil.performDumbAwareUpdate(action, e, false), ModalityState.NON_MODAL); final Presentation presentation = e.getPresentation();