From 4d30fdf28dc570da86df0d19f1955796050d1fc7 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Tue, 10 Apr 2018 17:51:20 +0300 Subject: [PATCH] WI-41555, WI-41328 fix empty scratch folders and db-console guids --- .../ide/projectView/impl/AbstractProjectViewPane.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java index f175133d3566..7eddd57f0f2c 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java @@ -297,6 +297,12 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl @Override public Object getData(String dataId) { + Object data = + myTreeStructure instanceof AbstractTreeStructureBase ? + ((AbstractTreeStructureBase)myTreeStructure).getDataFromProviders(getSelectedNodes(AbstractTreeNode.class), dataId) : null; + if (data != null) { + return data; + } if (CommonDataKeys.NAVIGATABLE_ARRAY.is(dataId)) { TreePath[] paths = getSelectionPaths(); if (paths == null) return null; @@ -318,9 +324,6 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl return navigatables.toArray(new Navigatable[0]); } } - if (myTreeStructure instanceof AbstractTreeStructureBase) { - return ((AbstractTreeStructureBase) myTreeStructure).getDataFromProviders(getSelectedNodes(AbstractTreeNode.class), dataId); - } return null; }