From 191e01e166780cc42e9d3dd26b3da371d38bda1a Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Wed, 24 Aug 2016 16:24:55 +0200 Subject: [PATCH] - enter in search field when preview is open navigates to selected result (IDEA-150336) - Find in Path dialog: Preview tab doesn't show file path anywhere (IDEA-150931) --- .../lang-impl/src/com/intellij/find/impl/FindDialog.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java index 95a53e727e1d..5bf5dbbefef8 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java @@ -369,14 +369,16 @@ public class FindDialog extends DialogWrapper { } ); - new AnAction() { + AnAction action = new AnAction() { @Override public void actionPerformed(AnActionEvent e) { if (isResultsPreviewTabActive()) { navigateToSelectedUsage(myResultsPreviewTable); } } - }.registerCustomShortcutSet(CommonShortcuts.getEditSource(), comboBox, myDisposable); + }; + action.registerCustomShortcutSet(CommonShortcuts.getEditSource(), comboBox, myDisposable); + action.registerCustomShortcutSet(CommonShortcuts.ENTER, comboBox, myDisposable); } } @@ -663,9 +665,12 @@ public class FindDialog extends DialogWrapper { if (index != -1) { UsageInfo usageInfo = ((UsageInfo2UsageAdapter)myResultsPreviewTable.getModel().getValueAt(index, 0)).getUsageInfo(); myUsagePreviewPanel.updateLayout(Collections.singletonList(usageInfo)); + VirtualFile file = usageInfo.getVirtualFile(); + myUsagePreviewPanel.setBorder(IdeBorderFactory.createTitledBorder(file != null ? file.getPath() : "", false)); } else { myUsagePreviewPanel.updateLayout(null); + myUsagePreviewPanel.setBorder(IdeBorderFactory.createBorder()); } } });