From 92abdc869f5e31352f6e72ea1198d998a3d7cdd9 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 15 Jul 2013 14:16:26 +0400
Subject: [PATCH] inadvertent changes reverted

---
 .../AbstractConsoleRunnerWithHistory.java     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
index e6a48745db26..65a8a91e3e54 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,7 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.wm.IdeFocusManager;
-import com.intellij.openapi.wm.ToolWindow;
-import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.util.Computable;
 import com.intellij.ui.SideBorder;
 import com.intellij.util.NotNullFunction;
 import com.intellij.util.containers.ContainerUtil;
@@ -121,6 +119,16 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
     final RunContentDescriptor contentDescriptor =
       new RunContentDescriptor(myConsoleView, myProcessHandler, panel, constructConsoleTitle(myConsoleTitle));
 
+    contentDescriptor.setFocusComputable(new Computable<JComponent>() {
+      @Override
+      public JComponent compute() {
+        final EditorEx editor = getLanguageConsole().getConsoleEditor();
+        return editor != null ? editor.getContentComponent() : null;
+      }
+    });
+    contentDescriptor.setAutoFocusContent(isAutoFocusContent());
+
+
 // tool bar actions
     final List<AnAction> actions = fillToolBarActions(toolbarActions, defaultExecutor, contentDescriptor);
     registerActionShortcuts(actions, getLanguageConsole().getConsoleEditor().getComponent());
@@ -167,6 +175,10 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
     return consoleTitle;
   }
 
+  public boolean isAutoFocusContent() {
+    return true;
+  }
+
   protected boolean shouldAddNumberToTitle() {
     return false;
   }