From 90159a5f277f5e5606cc94f233e25560c0574333 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 11 Dec 2019 08:28:11 +0100 Subject: [PATCH] IDEA-228892 IAE in ToolWindowManagerImpl.getToolWindow GitOrigin-RevId: 7b9d33913c88bd1565de87f1cefdaa1288551ad4 --- .../src/com/intellij/ide/actions/SelectInAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SelectInAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SelectInAction.java index 2bd62a80b4da..1a6a54ae765d 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SelectInAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SelectInAction.java @@ -85,8 +85,8 @@ public final class SelectInAction extends AnAction implements DumbAware { ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(selectInContext.getProject()); List list = new ArrayList<>(); for (SelectInTarget target : targets) { - String id = target.getMinorViewId() != null ? null : target.getToolWindowId(); - ToolWindow toolWindow = toolWindowManager.getToolWindow(id); + String id = target.getMinorViewId() == null ? target.getToolWindowId() : null; + ToolWindow toolWindow = id == null ? null : toolWindowManager.getToolWindow(id); Icon icon = toolWindow != null ? toolWindow.getIcon() : EmptyIcon.ICON_13; list.add(icon); }