MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Django console to work with the refactored Python console from #PR444

Browse Source
This commit is contained in:
Dmitry Trofimov
2016-10-04 14:59:22 +02:00
parent 1f06bd6663
commit f7bf6567ec
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/educational-python/src/META-INF/PyCharmEduPlugin.xml
View File

@@ -23,12 +23,6 @@
</component>
</application-components>
<extensions defaultExtensionNs="com.intellij">
<internal_executor id="PyConsoleToolWindowExecutor" implementation="com.jetbrains.python.console.PyConsoleToolWindowExecutor"/>
<postStartupActivity implementation="com.jetbrains.python.console.PyConsoleStarter"/>
</extensions>
<extensions defaultExtensionNs="com.intellij">
<programRunner implementation="com.jetbrains.python.edu.debugger.PyEduDebugRunner"/>
<executor implementation="com.jetbrains.python.edu.debugger.PyEduDebugExecutor" order="first,after run"/>

4
python/ide/src/META-INF/PyCharmCorePlugin.xml
View File

@@ -13,8 +13,4 @@
</component>
</application-components>
<extensions defaultExtensionNs="com.intellij">
<internal_executor id="PyConsoleToolWindowExecutor" implementation="com.jetbrains.python.console.PyConsoleToolWindowExecutor"/>
<postStartupActivity implementation="com.jetbrains.python.console.PyConsoleStarter"/>
</extensions>
</idea-plugin>

3
python/ide/src/META-INF/pycharm-core.xml
View File

@@ -76,6 +76,9 @@
<renameHandler implementation="com.intellij.platform.renameProject.ProjectFolderRenameHandler"/>
<!-- Console -->
<internal_executor id="PyConsoleToolWindowExecutor" implementation="com.jetbrains.python.console.PyConsoleToolWindowExecutor"/>
<postStartupActivity implementation="com.jetbrains.python.console.PyConsoleStarter"/>
<directoryIndexExcludePolicy implementation="com.jetbrains.python.PyDirectoryIndexExcludePolicy"/>

2
python/src/com/jetbrains/python/console/PydevConsoleRunnerFactory.java
View File

@@ -42,6 +42,7 @@ import java.util.Map;
*/
public class PydevConsoleRunnerFactory extends PythonConsoleRunnerFactory {
@Override
@NotNull
public PydevConsoleRunnerImpl createConsoleRunner(@NotNull Project project,
@Nullable Module contextModule) {
Pair<Sdk, Module> sdkAndModule = PydevConsoleRunner.findPythonSdkAndModule(project, contextModule);
@@ -125,6 +126,7 @@ public class PydevConsoleRunnerFactory extends PythonConsoleRunnerFactory {
envs.put(PythonEnvUtil.IPYTHONENABLE, ipythonEnabled);
}
@NotNull
protected PydevConsoleRunnerImpl createConsoleRunner(Project project,
Sdk sdk,
String workingDir,

2
python/src/com/jetbrains/python/console/PythonConsoleRunnerFactory.java
View File

@@ -29,6 +29,8 @@ public abstract class PythonConsoleRunnerFactory {
public static PythonConsoleRunnerFactory getInstance() {
return ServiceManager.getService(PythonConsoleRunnerFactory.class);
}
@NotNull
public abstract PydevConsoleRunner createConsoleRunner(@NotNull final Project project,
@Nullable Module contextModule);
}