From ae9ae8849805d4cae68e13193cd016ddc2272ce8 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 20 Jun 2013 19:51:37 +0400 Subject: [PATCH] allow to select console from tests tree with tab (IDEA-66537) and return --- .../src/com/intellij/openapi/editor/actions/TabAction.java | 2 +- .../intellij/execution/testframework/ui/TestResultsPanel.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java index ec2556f9e89b..5064ad11ffed 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java @@ -57,7 +57,7 @@ public class TabAction extends EditorAction { @Override public boolean isEnabled(Editor editor, DataContext dataContext) { - return !editor.isOneLineMode() && !((EditorEx)editor).isEmbeddedIntoDialogWrapper(); + return !editor.isOneLineMode() && !((EditorEx)editor).isEmbeddedIntoDialogWrapper() && !editor.isViewer(); } } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java index 7429069c3b33..cf3bed4b403d 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java @@ -139,6 +139,7 @@ public abstract class TestResultsPanel extends JPanel implements Disposable { private static JComponent createOutputTab(JComponent console, AnAction[] consoleActions) { JPanel outputTab = new JPanel(new BorderLayout()); + console.setFocusable(true); outputTab.add(console, BorderLayout.CENTER); final DefaultActionGroup actionGroup = new DefaultActionGroup(consoleActions); final ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, actionGroup, false);