From d6432fc066c2b8bfa89d28c1f14909a81a982e49 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Fri, 5 Apr 2013 13:47:49 +0200
Subject: [PATCH] Open debug  console action in Tools menu.

---
 .../com/intellij/execution/ExecutionHelper.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
index 53b3a5f35d78..e998207dbe09 100644
--- a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
+++ b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
@@ -23,11 +23,11 @@ import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.ide.errorTreeView.NewErrorTreeViewPanel;
+import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -317,13 +317,14 @@ public class ExecutionHelper {
     return result;
   }
 
-  public static void selectContentDescriptor(final @NotNull Editor editor,
+  public static void selectContentDescriptor(final @NotNull DataContext dataContext,
+                                             final @NotNull Project project,
                                              @NotNull Collection<RunContentDescriptor> consoles,
                                              String selectDialogTitle, final Consumer<RunContentDescriptor> descriptorConsumer) {
     if (consoles.size() == 1) {
       RunContentDescriptor descriptor = consoles.iterator().next();
       descriptorConsumer.consume(descriptor);
-      descriptorToFront(editor, descriptor);
+      descriptorToFront(project, descriptor);
     }
     else if (consoles.size() > 1) {
       final JList list = new JBList(consoles);
@@ -350,15 +351,14 @@ public class ExecutionHelper {
           if (selectedValue instanceof RunContentDescriptor) {
             RunContentDescriptor descriptor = (RunContentDescriptor)selectedValue;
             descriptorConsumer.consume(descriptor);
-            descriptorToFront(editor, descriptor);
+            descriptorToFront(project, descriptor);
           }
         }
-      }).createPopup().showInBestPositionFor(editor);
+      }).createPopup().showInBestPositionFor(dataContext);
     }
   }
 
-  private static void descriptorToFront(final Editor editor, final RunContentDescriptor descriptor) {
-    final Project project = editor.getProject();
+  private static void descriptorToFront(final Project project, final RunContentDescriptor descriptor) {
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         final ToolWindow toolWindow = ExecutionManager.getInstance(project).getContentManager().getToolWindowByDescriptor(descriptor);