From 59f2fa54e9b69081bae532e809fc404ae99a73fa Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 31 Oct 2016 22:28:07 +0300 Subject: [PATCH] IDEA-163234 SelectIn... | Favorites doesn't work if the toolwindow hasn't been opened yet --- .../FavoritesViewSelectInTarget.java | 21 +++++++++---------- .../openapi/wm/impl/ToolWindowImpl.java | 1 - 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSelectInTarget.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSelectInTarget.java index acb1de464739..f29d52f51f29 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSelectInTarget.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSelectInTarget.java @@ -68,20 +68,19 @@ public class FavoritesViewSelectInTarget extends SelectInTargetPsiWrapper { final ToolWindow favoritesToolWindow = windowManager.getToolWindow(ToolWindowId.FAVORITES_VIEW); if (favoritesToolWindow != null) { - final FavoritesTreeViewPanel panel = UIUtil.findComponentOfType(favoritesToolWindow.getComponent(), FavoritesTreeViewPanel.class); - - if (panel != null) { - final Runnable runnable = () -> { + final Runnable runnable = () -> { + final FavoritesTreeViewPanel panel = UIUtil.findComponentOfType(favoritesToolWindow.getComponent(), FavoritesTreeViewPanel.class); + if (panel != null) { panel.selectElement(toSelect, virtualFile, requestFocus); result.setDone(); - }; + } + }; - if (requestFocus) { - favoritesToolWindow.activate(runnable, false); - } - else { - favoritesToolWindow.show(runnable); - } + if (requestFocus) { + favoritesToolWindow.activate(runnable, false); + } + else { + favoritesToolWindow.show(runnable); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java index a8187868b8ad..89751f2c1923 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java @@ -394,7 +394,6 @@ public final class ToolWindowImpl implements ToolWindowEx { @Override public final JComponent getComponent() { - ensureContentInitialized(); return myComponent; }