summaryrefslogtreecommitdiff
path: root/python/src/META-INF/python-core.xml
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-08-21 00:31:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-16 04:55:08 +0000
commit9cde0e3c015174898df8b8f3672185941fad4786 (patch)
tree80a55c7b59c38377216daaada4e8bc47b69ceb9a /python/src/META-INF/python-core.xml
parent3b37877a2561bf9fbe072253a18688807d523505 (diff)
parentd76e3920c56d37c942092b7dca20fcaded81c0a5 (diff)
downloadidea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'python/src/META-INF/python-core.xml')
-rw-r--r--python/src/META-INF/python-core.xml19
1 files changed, 2 insertions, 17 deletions
diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index a27eb44ae3af..292237aac6ac 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -529,11 +529,6 @@
<moduleService serviceInterface="com.jetbrains.python.packaging.PyPackageRequirementsSettings"
serviceImplementation="com.jetbrains.python.packaging.PyPackageRequirementsSettings"/>
- <!-- Console -->
- <toolWindow id="Python Console" anchor="bottom" icon=""
- factoryClass="com.jetbrains.python.console.PythonConsoleToolWindowFactory" secondary="false"/>
-
-
</extensions>
<extensionPoints>
@@ -621,12 +616,6 @@
</component>
</project-components>
- <project-components>
- <component>
- <implementation-class>com.jetbrains.python.console.PythonConsoleToolWindow</implementation-class>
- </component>
- </project-components>
-
<actions>
<group id="PyTypeHierarchyPopupMenu">
<reference ref="TypeHierarchyBase.BaseOnThisType"/>
@@ -655,11 +644,7 @@
<reference ref="CompareFileWithEditor"/>
</group>
- <action id="com.jetbrains.python.console.RunPythonConsoleAction"
- class="com.jetbrains.python.console.RunPythonConsoleAction"
- text="Run Python Console..." description="Allows to quickly run Python console">
- <add-to-group group-id="ToolsMenu" anchor="last"/>
- </action>
+
<action id="com.jetbrains.python.console.PyOpenDebugConsoleAction"
class="com.jetbrains.python.console.PyOpenDebugConsoleAction"
@@ -669,7 +654,7 @@
<action id="ExecuteInPyConsoleAction"
- class="com.jetbrains.python.actions.ExecuteInConsoleAction"
+ class="com.jetbrains.python.actions.PyExecuteSelectionAction"
text="Execute selection in console"
description="Executes selected code fragment in Python/Django console">
<add-to-group group-id="EditorPopupMenu" anchor="before" relative-to-action="CompareClipboardWithSelection"/>