Merge remote-tracking branch 'origin/master'

python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java

@@ -19,6 +19,7 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiManager;
 import com.intellij.util.PathUtil;
 import com.jetbrains.edu.coursecreator.settings.CCSettings;
+import com.jetbrains.edu.learning.checker.PyStudyTaskChecker;
 import com.jetbrains.edu.learning.checker.StudyTaskChecker;
 import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.courseFormat.Course;

python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudySmartChecker.java

@@ -0,0 +1,144 @@
+package com.jetbrains.edu.learning.checker;
+
+import com.intellij.execution.ExecutionException;
+import com.intellij.execution.process.CapturingProcessHandler;
+import com.intellij.execution.process.ProcessOutput;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.jetbrains.edu.learning.StudyTaskManager;
+import com.jetbrains.edu.learning.StudyUtils;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+
+class PyStudySmartChecker {
+  private PyStudySmartChecker() {
+
+  }
+
+  private static final Logger LOG = Logger.getInstance(PyStudySmartChecker.class);
+
+  private static void smartCheck(@NotNull final AnswerPlaceholder placeholder,
+                                @NotNull final Project project,
+                                @NotNull final VirtualFile answerFile,
+                                @NotNull final TaskFile answerTaskFile,
+                                @NotNull final TaskFile usersTaskFile,
+                                @NotNull final PyStudyTestRunner testRunner,
+                                @NotNull final VirtualFile virtualFile,
+                                @NotNull final Document usersDocument) {
+    VirtualFile fileWindows = null;
+    VirtualFile windowCopy = null;
+    try {
+      final int index = placeholder.getIndex();
+      String windowCopyName = answerFile.getNameWithoutExtension() + index + EduNames.WINDOW_POSTFIX + answerFile.getExtension();
+      windowCopy = answerFile.copy(project, answerFile.getParent(), windowCopyName);
+      final FileDocumentManager documentManager = FileDocumentManager.getInstance();
+      final Document windowDocument = documentManager.getDocument(windowCopy);
+      if (windowDocument != null) {
+        TaskFile windowTaskFile = answerTaskFile.getTask().copy().getTaskFile(StudyUtils.pathRelativeToTask(virtualFile));
+        if (windowTaskFile == null) {
+          return;
+        }
+        EduDocumentListener listener = new EduDocumentListener(windowTaskFile);
+        windowDocument.addDocumentListener(listener);
+        int start = placeholder.getOffset();
+        int end = start + placeholder.getRealLength();
+        final AnswerPlaceholder userAnswerPlaceholder = usersTaskFile.getAnswerPlaceholders().get(placeholder.getIndex());
+        int userStart = userAnswerPlaceholder.getOffset();
+        int userEnd = userStart + userAnswerPlaceholder.getRealLength();
+        String text = usersDocument.getText(new TextRange(userStart, userEnd));
+        windowDocument.replaceString(start, end, text);
+        ApplicationManager.getApplication().runWriteAction(() -> documentManager.saveDocument(windowDocument));
+        fileWindows = EduUtils.flushWindows(windowTaskFile, windowCopy);
+        Process smartTestProcess = testRunner.createCheckProcess(project, windowCopy.getPath());
+        final CapturingProcessHandler handler = new CapturingProcessHandler(smartTestProcess, null, windowCopy.getPath());
+        final ProcessOutput output = handler.runProcess();
+        final Course course = StudyTaskManager.getInstance(project).getCourse();
+        if (course != null) {
+          boolean res = StudyTestsOutputParser.getTestsOutput(output, course.isAdaptive()).isSuccess();
+          StudyTaskManager.getInstance(project).setStatus(userAnswerPlaceholder, res ? StudyStatus.Solved : StudyStatus.Failed);
+        }
+      }
+    }
+    catch (ExecutionException | IOException e) {
+      LOG.error(e);
+    }
+    finally {
+      StudyUtils.deleteFile(windowCopy);
+      StudyUtils.deleteFile(fileWindows);
+    }
+  }
+
+  static void runSmartTestProcess(@NotNull final VirtualFile taskDir,
+                                         @NotNull final PyStudyTestRunner testRunner,
+                                         @NotNull final String taskFileName,
+                                         @NotNull final TaskFile taskFile,
+                                         @NotNull final Project project) {
+    final VirtualFile virtualFile = taskDir.findFileByRelativePath(taskFileName);
+    if (virtualFile == null) {
+      return;
+    }
+    Pair<VirtualFile, TaskFile> pair = getCopyWithAnswers(taskDir, virtualFile, taskFile);
+    if (pair == null) {
+      return;
+    }
+    VirtualFile answerFile = pair.getFirst();
+    TaskFile answerTaskFile = pair.getSecond();
+    try {
+      for (final AnswerPlaceholder answerPlaceholder : answerTaskFile.getActivePlaceholders()) {
+        final Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
+        if (document == null) {
+          continue;
+        }
+        smartCheck(answerPlaceholder, project, answerFile, answerTaskFile, taskFile, testRunner,
+                   virtualFile, document);
+      }
+    }
+    finally {
+      StudyUtils.deleteFile(answerFile);
+    }
+  }
+
+  static Pair<VirtualFile, TaskFile> getCopyWithAnswers(@NotNull final VirtualFile taskDir,
+                                                                @NotNull final VirtualFile file,
+                                                                @NotNull final TaskFile source) {
+    try {
+      VirtualFile answerFile = file.copy(taskDir, taskDir, file.getNameWithoutExtension() + EduNames.ANSWERS_POSTFIX + "." + file.getExtension());
+      final FileDocumentManager documentManager = FileDocumentManager.getInstance();
+      final Document document = documentManager.getDocument(answerFile);
+      if (document != null) {
+        TaskFile answerTaskFile = source.getTask().copy().getTaskFile(StudyUtils.pathRelativeToTask(file));
+        if (answerTaskFile == null) {
+          return null;
+        }
+        EduDocumentListener listener = new EduDocumentListener(answerTaskFile);
+        document.addDocumentListener(listener);
+        for (AnswerPlaceholder answerPlaceholder : answerTaskFile.getActivePlaceholders()) {
+          final int start = answerPlaceholder.getOffset();
+          final int end = start + answerPlaceholder.getRealLength();
+          final String text = answerPlaceholder.getPossibleAnswer();
+          document.replaceString(start, end, text);
+        }
+        ApplicationManager.getApplication().runWriteAction(() -> documentManager.saveDocument(document));
+        return Pair.create(answerFile, answerTaskFile);
+      }
+    }
+    catch (IOException e) {
+      LOG.error(e);
+    }
+    return null;
+  }
+}

python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTaskChecker.java

@@ -1,4 +1,4 @@
-package com.jetbrains.edu.learning;
+package com.jetbrains.edu.learning.checker;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.openapi.application.ApplicationManager;
@@ -6,8 +6,10 @@ import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.jetbrains.edu.learning.StudyState;
+import com.jetbrains.edu.learning.StudyTaskManager;
+import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.actions.StudyCheckAction;
-import com.jetbrains.edu.learning.checker.*;
 import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.core.EduUtils;
 import com.jetbrains.edu.learning.courseFormat.Course;
@@ -44,7 +46,7 @@ public class PyStudyTaskChecker extends StudyTaskChecker<PyCharmTask> {
         StudyCheckUtils.flushWindows(myTask, taskDir);
         latch.countDown();
       }));
-    final StudyTestRunner testRunner = new PyStudyTestRunner(myTask, taskDir);
+    final PyStudyTestRunner testRunner = new PyStudyTestRunner(myTask, taskDir);
     try {
       final VirtualFile fileToCheck = getTaskVirtualFile(myTask, taskDir);
       if (fileToCheck != null) {
@@ -90,7 +92,7 @@ public class PyStudyTaskChecker extends StudyTaskChecker<PyCharmTask> {
         if (course != null && EduNames.STUDY.equals(course.getCourseMode())) {
           CommandProcessor.getInstance().runUndoTransparentAction(
             () -> ApplicationManager.getApplication().runWriteAction(
-              () -> StudyCheckUtils.runSmartTestProcess(taskDir, new PyStudyTestRunner(myTask, taskDir), name, taskFile, myProject)));
+              () -> PyStudySmartChecker.runSmartTestProcess(taskDir, new PyStudyTestRunner(myTask, taskDir), name, taskFile, myProject)));
         }
       }
       StudyCheckUtils.navigateToFailedPlaceholder(new StudyState(StudyUtils.getSelectedStudyEditor(myProject)), myTask, taskDir, myProject);

python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/checker/PyStudyTestRunner.java

@@ -1,4 +1,4 @@
-package com.jetbrains.edu.learning;
+package com.jetbrains.edu.learning.checker;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
@@ -8,7 +8,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.FileUtilRt;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.learning.checker.StudyTestRunner;
+import com.jetbrains.edu.learning.PyEduPluginConfigurator;
 import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.tasks.TaskWithSubtasks;
@@ -18,15 +18,18 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 import java.util.Map;
 
-public class PyStudyTestRunner extends StudyTestRunner {
+class PyStudyTestRunner {
   private static final String PYTHONPATH = "PYTHONPATH";
+  @NotNull private final Task myTask;
+  @NotNull private final VirtualFile myTaskDir;
   private GeneralCommandLine myCommandLine;
 
   PyStudyTestRunner(@NotNull final Task task, @NotNull final VirtualFile taskDir) {
-    super(task, taskDir);
+    myTask = task;
+    myTaskDir = taskDir;
   }
 
-  public Process createCheckProcess(@NotNull final Project project, @NotNull final String executablePath) throws ExecutionException {
+  Process createCheckProcess(@NotNull final Project project, @NotNull final String executablePath) throws ExecutionException {
     final Sdk sdk = PythonSdkType.findPythonSdk(ModuleManager.getInstance(project).getModules()[0]);
     PyEduPluginConfigurator configurator = new PyEduPluginConfigurator();
     String testsFileName = configurator.getTestFileName();
@@ -56,8 +59,7 @@ public class PyStudyTestRunner extends StudyTestRunner {
     return null;
   }
 
-  @Override
-  public GeneralCommandLine getCommandLine() {
+  GeneralCommandLine getCommandLine() {
     return myCommandLine;
   }
 }