From f405e09eee65615eeab7182849c656a386544dd9 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 13 Dec 2011 03:14:58 +0400 Subject: [PATCH] IDEA-78207 Ctrl-N keyboard shortcut in favorites window seems hard-coded --- .../ide/favoritesTreeView/FavoritesTreeViewPanel.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java index ccbb35d7dc63..49c73ffe0e69 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java @@ -199,6 +199,8 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider { decorator.addExtraAction(new FavoritesAutoScrollToSourceAction(myProject, myAutoScrollToSourceHandler, myBuilder)); + AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_NEW_ELEMENT); + action.registerCustomShortcutSet(action.getShortcutSet(), myTree); final JPanel panel = decorator.createPanel(); panel.setBorder(IdeBorderFactory.createEmptyBorder(0)); @@ -532,6 +534,14 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider { } } return ((PsiDirectoryContainer)psiElement).getDirectories(searchScope); + } else if (psiElement != null) { + PsiFile file = psiElement.getContainingFile(); + if (file != null) { + PsiDirectory parent = file.getParent(); + if (parent != null) { + return new PsiDirectory[]{parent}; + } + } } } return selectedNodeElements[0] instanceof PsiDirectory ? new PsiDirectory[] {(PsiDirectory)selectedNodeElements[0]} : null;