From 00896cfdc4642671615933f082d8c176c97c360f Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 8 Feb 2016 22:31:45 +0100
Subject: [PATCH] In PyCharm IDE Python console should be shown in a dedicated
 toolwindow (PY-18302)

---
 python/ide/src/META-INF/PyCharmCorePlugin.xml              | 5 +++++
 .../pluginCore/META-INF/python-community-plugin-core.xml   | 7 +++++++
 python/src/META-INF/python-core-common.xml                 | 4 ----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/python/ide/src/META-INF/PyCharmCorePlugin.xml b/python/ide/src/META-INF/PyCharmCorePlugin.xml
index 9784c7bc622d..ac8651e95fad 100644
--- a/python/ide/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide/src/META-INF/PyCharmCorePlugin.xml
@@ -7,5 +7,10 @@
       <implementation-class>com.jetbrains.python.PyCharmInitialConfigurator</implementation-class>
       <headless-implementation-class/>
     </component>
+
+    <component>
+      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
+      <implementation-class>com.jetbrains.python.console.PythonToolWindowConsoleRunnerFactory</implementation-class>
+    </component>
   </application-components>
 </idea-plugin>
diff --git a/python/pluginCore/META-INF/python-community-plugin-core.xml b/python/pluginCore/META-INF/python-community-plugin-core.xml
index e467f308d0df..773c0f08e9ca 100644
--- a/python/pluginCore/META-INF/python-community-plugin-core.xml
+++ b/python/pluginCore/META-INF/python-community-plugin-core.xml
@@ -12,5 +12,12 @@
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
   </actions>
+  
+  <application-components>
+    <component>
+      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
+      <implementation-class>com.jetbrains.python.console.PydevConsoleRunnerFactory</implementation-class>
+    </component>
+  </application-components>
 
 </idea-plugin>
\ No newline at end of file
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 5d3155957b3c..73499939e3de 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -817,9 +817,5 @@
     <component>
       <implementation-class>com.jetbrains.python.testing.VFSTestFrameworkListener</implementation-class>
     </component>
-    <component>
-      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
-      <implementation-class>com.jetbrains.python.console.PydevConsoleRunnerFactory</implementation-class>
-    </component>
   </application-components>
 </idea-plugin>
\ No newline at end of file