MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EDU-881 Remove StudyExecutor

Browse Source
This commit is contained in:
Liana.Bakradze
2017-04-07 19:40:57 +03:00
parent 6d5b53535c
commit 6fb957d677
9 changed files with 6 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-python/Edu-Python/resources/META-INF/plugin.xml
-1
View File
@@ -35,7 +35,6 @@
<importResolver implementation="com.jetbrains.edu.learning.PyStudyImportResolver"/>
</extensions>
<extensions defaultExtensionNs="Edu">
<StudyExecutor implementationClass="com.jetbrains.edu.learning.PyStudyExecutor" language="Python"/>
<pluginConfigurator implementationClass="com.jetbrains.edu.learning.PyEduPluginConfigurator" language="Python"/>
</extensions>
<actions>
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class PyStudyCheckAction extends StudyCheckAction {
ApplicationManager.getApplication().invokeLater(
() -> IdeFocusManager.getInstance(project).requestFocus(studyState.getEditor().getComponent(), true));
final StudyTestRunner testRunner = StudyUtils.getTestRunner(task, taskDir);
final StudyTestRunner testRunner = new PyStudyTestRunner(task, taskDir);
Process testProcess = null;
String commandLine = "";
try {
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyStudyExecutor.java
-96
View File
@@ -1,96 +0,0 @@
/*
* Copyright 2000-2014 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.edu.learning;
import com.intellij.execution.RunContentExecutor;
import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.execution.process.ProcessHandler;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.ui.popup.BalloonBuilder;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
import com.jetbrains.edu.learning.checker.StudyExecutor;
import com.jetbrains.edu.learning.checker.StudyTestRunner;
import com.jetbrains.edu.learning.courseFormat.UserTest;
import com.jetbrains.python.run.PythonTracebackFilter;
import com.jetbrains.python.sdk.PythonSdkType;
import org.jetbrains.annotations.NotNull;
import javax.swing.event.HyperlinkEvent;
import java.io.File;
import java.util.List;
public class PyStudyExecutor implements StudyExecutor {
@Override
public Sdk findSdk(@NotNull final Project project) {
return PythonSdkType.findPythonSdk(ModuleManager.getInstance(project).getModules()[0]);
}
@Override
public StudyTestRunner getTestRunner(@NotNull final Task task, @NotNull final VirtualFile taskDir) {
return new PyStudyTestRunner(task, taskDir);
}
@Override
public RunContentExecutor getExecutor(@NotNull final Project project, @NotNull final ProcessHandler handler) {
return new RunContentExecutor(project, handler).withFilter(new PythonTracebackFilter(project));
}
@Override
public void setCommandLineParameters(@NotNull final GeneralCommandLine cmd,
@NotNull final Project project,
@NotNull final String filePath,
@NotNull final String sdkPath,
@NotNull final Task currentTask) {
final List<UserTest> userTests = StudyTaskManager.getInstance(project).getUserTests(currentTask);
if (!userTests.isEmpty()) {
EduPluginConfigurator configurator = EduPluginConfigurator.INSTANCE.forLanguage(currentTask.getLesson().getCourse().getLanguageById());
if (configurator != null) {
cmd.addParameter(new File(project.getBaseDir().getPath(), "user_tester.py").getPath());
cmd.addParameter(sdkPath);
cmd.addParameter(filePath);
}
}
else {
cmd.addParameter(filePath);
}
}
public void showNoSdkNotification(@NotNull final Project project) {
final String text = "<html>No Python interpreter configured for the project<br><a href=\"\">Configure interpreter</a></html>";
final BalloonBuilder balloonBuilder = JBPopupFactory.getInstance().
createHtmlTextBalloonBuilder(text, null,
MessageType.WARNING.getPopupBackground(),
event -> {
if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
ApplicationManager.getApplication()
.invokeLater(
() -> ShowSettingsUtil.getInstance().showSettingsDialog(project, "Project Interpreter"));
}
});
balloonBuilder.setHideOnLinkClick(true);
final Balloon balloon = balloonBuilder.createBalloon();
StudyUtils.showCheckPopUp(project, balloon);
}
}