delete subtask

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCSubtaskEditorNotificationProvider.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCSubtaskEditorNotificationProvider.java
index b049e851fef573656692dde3ae8fff0421040fb0..d0911b18080f1d70502d22b491cf66219261e2c1 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCSubtaskEditorNotificationProvider.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCSubtaskEditorNotificationProvider.java
@@ -1,8 +1,11 @@
 package com.jetbrains.edu.coursecreator;
 
 package com.jetbrains.edu.coursecreator;
 

+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;

 import com.intellij.openapi.editor.colors.EditorColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.editor.colors.EditorColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.fileEditor.FileEditor;

+import com.intellij.openapi.fileEditor.FileEditorManager;

 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopupFactory;


@@ -10,27 +13,34 @@ import com.intellij.openapi.ui.popup.ListSeparator;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.openapi.util.Key;

+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.io.FileUtilRt;

 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.EditorNotificationPanel;
 import com.intellij.ui.EditorNotifications;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.EditorNotificationPanel;
 import com.intellij.ui.EditorNotifications;
 import com.intellij.ui.awt.RelativePoint;

+import com.intellij.util.containers.ContainerUtil;

 import com.jetbrains.edu.coursecreator.actions.CCNewSubtaskAction;
 import com.jetbrains.edu.learning.StudySubtaskUtils;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.coursecreator.actions.CCNewSubtaskAction;
 import com.jetbrains.edu.learning.StudySubtaskUtils;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.core.EduNames;

+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholderSubtaskInfo;

 import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.courseFormat.Task;

+import com.jetbrains.edu.learning.courseFormat.TaskFile;

 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;

-import java.util.ArrayList;
-import java.util.Arrays;
+import java.io.IOException;
+import java.util.*;

 import java.util.List;
 
 public class CCSubtaskEditorNotificationProvider extends EditorNotifications.Provider<EditorNotificationPanel> implements DumbAware {
   private static final Key<EditorNotificationPanel> KEY = Key.create("edu.coursecreator.subtask");
   public static final String SWITCH_SUBTASK = "Switch subtask";
   public static final Integer ADD_SUBTASK_ID = -1;
 import java.util.List;
 
 public class CCSubtaskEditorNotificationProvider extends EditorNotifications.Provider<EditorNotificationPanel> implements DumbAware {
   private static final Key<EditorNotificationPanel> KEY = Key.create("edu.coursecreator.subtask");
   public static final String SWITCH_SUBTASK = "Switch subtask";
   public static final Integer ADD_SUBTASK_ID = -1;

+  private static final Logger LOG = Logger.getInstance(CCSubtaskEditorNotificationProvider.class);

   private final Project myProject;
 
   public CCSubtaskEditorNotificationProvider(Project project) {
   private final Project myProject;
 
   public CCSubtaskEditorNotificationProvider(Project project) {


@@ -74,7 +84,8 @@ public class CCSubtaskEditorNotificationProvider extends EditorNotifications.Pro
         values.add(i);
       }
       values.add(ADD_SUBTASK_ID);
         values.add(i);
       }
       values.add(ADD_SUBTASK_ID);

-      JBPopupFactory.getInstance().createListPopup(new SwitchSubtaskPopupStep(SWITCH_SUBTASK, values, task, file)).show(RelativePoint.getSouthEastOf(panel));
+      JBPopupFactory.getInstance().createListPopup(new SwitchSubtaskPopupStep(SWITCH_SUBTASK, values, task, file))
+        .show(RelativePoint.getSouthEastOf(panel));

     });
     return panel;
   }
     });
     return panel;
   }


@@ -100,7 +111,7 @@ public class CCSubtaskEditorNotificationProvider extends EditorNotifications.Pro
       int subtaskNum = value + 1;
       String text = EduNames.SUBTASK + " " + subtaskNum;
       if (value == myTask.getActiveSubtaskIndex()) {
       int subtaskNum = value + 1;
       String text = EduNames.SUBTASK + " " + subtaskNum;
       if (value == myTask.getActiveSubtaskIndex()) {

-        text +=  " (selected)";
+        text += " (selected)";

       }
       return text;
     }
       }
       return text;
     }


@@ -112,7 +123,8 @@ public class CCSubtaskEditorNotificationProvider extends EditorNotifications.Pro
           return doFinalStep(() -> CCNewSubtaskAction.addSubtask(myFile, myProject));
         }
         StudySubtaskUtils.switchStep(myProject, myTask, selectedValue);
           return doFinalStep(() -> CCNewSubtaskAction.addSubtask(myFile, myProject));
         }
         StudySubtaskUtils.switchStep(myProject, myTask, selectedValue);

-      } else {
+      }
+      else {

         if (hasSubstep(selectedValue)) {
           return new ActionsPopupStep(myTask, selectedValue);
         }
         if (hasSubstep(selectedValue)) {
           return new ActionsPopupStep(myTask, selectedValue);
         }


@@ -155,16 +167,116 @@ public class CCSubtaskEditorNotificationProvider extends EditorNotifications.Pro
       if (finalChoice) {
         if (selectedValue.equals(SELECT)) {
           StudySubtaskUtils.switchStep(myProject, myTask, mySubtaskIndex);
       if (finalChoice) {
         if (selectedValue.equals(SELECT)) {
           StudySubtaskUtils.switchStep(myProject, myTask, mySubtaskIndex);

-        } else {
+        }
+        else {
+          for (TaskFile taskFile : myTask.getTaskFiles().values()) {
+            List<AnswerPlaceholder> emptyPlaceholders = new ArrayList<>();
+            for (AnswerPlaceholder placeholder : taskFile.getAnswerPlaceholders()) {
+              Map<Integer, AnswerPlaceholderSubtaskInfo> infos = placeholder.getSubtaskInfos();
+              if (infos.containsKey(mySubtaskIndex)) {
+                infos.remove(mySubtaskIndex);
+                if (infos.isEmpty()) {
+                  emptyPlaceholders.add(placeholder);
+                }
+              }
+            }
+            taskFile.getAnswerPlaceholders().removeAll(emptyPlaceholders);
+          }
+          VirtualFile taskDir = myTask.getTaskDir(myProject);
+          if (taskDir == null) {
+            return FINAL_CHOICE;
+          }
+          deleteSubtaskFiles(taskDir);

           if (mySubtaskIndex != myTask.getLastSubtaskIndex()) {
           if (mySubtaskIndex != myTask.getLastSubtaskIndex()) {

-            //TODO: implement
-          } else {
-            //TODO: delete last subtask
+            renameFiles(taskDir);
+            updateInfoIndexes();

           }
           }

+          myTask.setLastSubtaskIndex(myTask.getLastSubtaskIndex() - 1);
+          int activeSubtaskIndex = myTask.getActiveSubtaskIndex();
+          if (mySubtaskIndex != 0 && activeSubtaskIndex == mySubtaskIndex) {
+            StudySubtaskUtils.switchStep(myProject, myTask, mySubtaskIndex - 1);
+          }
+          if (activeSubtaskIndex > mySubtaskIndex) {
+            myTask.setActiveSubtaskIndex(activeSubtaskIndex - 1);
+          }
+          StudySubtaskUtils.updateUI(myProject, myTask, taskDir);
+          for (VirtualFile file : FileEditorManager.getInstance(myProject).getOpenFiles()) {
+            EditorNotifications.getInstance(myProject).updateNotifications(file);
+          }
+

           return FINAL_CHOICE;
         }
       }
       return super.onChosen(selectedValue, finalChoice);
     }
           return FINAL_CHOICE;
         }
       }
       return super.onChosen(selectedValue, finalChoice);
     }

+
+    private void updateInfoIndexes() {
+      for (TaskFile taskFile : myTask.getTaskFiles().values()) {
+        for (AnswerPlaceholder placeholder : taskFile.getAnswerPlaceholders()) {
+          List<Integer> filtered = ContainerUtil.filter(placeholder.getSubtaskInfos().keySet(), index -> index > mySubtaskIndex);
+          Map<Integer, AnswerPlaceholderSubtaskInfo> savedInfos = new HashMap<>();
+          for (Integer index : filtered) {
+            savedInfos.put(index, placeholder.getSubtaskInfos().get(index));
+            placeholder.getSubtaskInfos().remove(index);
+          }
+          for (Integer index : filtered) {
+            placeholder.getSubtaskInfos().put(index - 1, savedInfos.get(index));
+          }
+        }
+      }
+    }
+
+    private void renameFiles(VirtualFile taskDir) {
+      ApplicationManager.getApplication().runWriteAction(() -> {
+        Map<VirtualFile, String> newNames = new HashMap<>();
+        for (VirtualFile virtualFile : taskDir.getChildren()) {
+          int subtaskIndex = CCUtils.getSubtaskIndex(myProject, virtualFile);
+          if (subtaskIndex == -1) {
+            continue;
+          }
+          if (subtaskIndex > mySubtaskIndex) {
+            String index = subtaskIndex == 1 ? "" : Integer.toString(subtaskIndex - 1);
+            String fileName = virtualFile.getName();
+            String nameWithoutExtension = FileUtil.getNameWithoutExtension(fileName);
+            String extension = FileUtilRt.getExtension(fileName);
+            int subtaskMarkerIndex = nameWithoutExtension.indexOf(EduNames.SUBTASK_MARKER);
+            String newName = subtaskMarkerIndex == -1
+                             ? nameWithoutExtension
+                             : nameWithoutExtension.substring(0, subtaskMarkerIndex);
+            newName += index.isEmpty() ? "" : EduNames.SUBTASK_MARKER;
+            newName += index + "." + extension;
+            newNames.put(virtualFile, newName);
+          }
+        }
+        for (Map.Entry<VirtualFile, String> entry : newNames.entrySet()) {
+          try {
+            entry.getKey().rename(myProject, entry.getValue());
+          }
+          catch (IOException e) {
+            LOG.info(e);
+          }
+        }
+      });
+    }
+
+    private void deleteSubtaskFiles(VirtualFile taskDir) {
+      ApplicationManager.getApplication().runWriteAction(() -> {
+        List<VirtualFile> filesToDelete = new ArrayList<>();
+        for (VirtualFile file : taskDir.getChildren()) {
+          int index = CCUtils.getSubtaskIndex(myProject, file);
+          if (index != -1 && mySubtaskIndex == index) {
+            filesToDelete.add(file);
+          }
+        }
+        for (VirtualFile file : filesToDelete) {
+          try {
+            file.delete(myProject);
+          }
+          catch (IOException e) {
+            LOG.info(e);
+          }
+        }
+      });
+    }

   }
 }
\ No newline at end of file
   }
 }
\ No newline at end of file

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
index cf5af7a8398d6e8c229653b56329b8a0032d02f2..ea697bdc1ded757c336925b8be4840bac33438ea 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
@@ -26,6 +26,7 @@ import com.intellij.util.Function;
 import com.jetbrains.edu.coursecreator.settings.CCSettings;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.coursecreator.settings.CCSettings;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;

+import com.jetbrains.edu.learning.core.EduNames;

 import com.jetbrains.edu.learning.core.EduUtils;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.learning.core.EduUtils;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;


@@ -47,6 +48,28 @@ public class CCUtils {
   public static final String GENERATED_FILES_FOLDER = ".coursecreator";
   public static final String COURSE_MODE = "Course Creator";
 
   public static final String GENERATED_FILES_FOLDER = ".coursecreator";
   public static final String COURSE_MODE = "Course Creator";
 

+  public static int getSubtaskIndex(Project project, VirtualFile file) {
+    String fileName = file.getName();
+    String name = FileUtil.getNameWithoutExtension(fileName);
+    boolean canBeSubtaskFile = isTestsFile(project, file) || StudyUtils.isTaskDescriptionFile(fileName);
+    if (!canBeSubtaskFile) {
+      return -1;
+    }
+    if (!name.contains(EduNames.SUBTASK_MARKER)) {
+      return 0;
+    }
+    int markerIndex = name.indexOf(EduNames.SUBTASK_MARKER);
+    String index = name.substring(markerIndex + EduNames.SUBTASK_MARKER.length());
+    if (index.isEmpty()) {
+      return -1;
+    }
+    try {
+      return Integer.valueOf(index);
+    } catch (NumberFormatException e) {
+      return -1;
+    }
+  }
+

   @Nullable
   public static CCLanguageManager getStudyLanguageManager(@NotNull final Course course) {
     Language language = Language.findLanguageByID(course.getLanguageID());
   @Nullable
   public static CCLanguageManager getStudyLanguageManager(@NotNull final Course course) {
     Language language = Language.findLanguageByID(course.getLanguageID());

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskUtils.java
index 705c70dfd1872bd7da2ad8ffaf6b4161c5b7b0bc..2f2c2c2111929d96f2f25aac1ff2ec1c60b71848 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskUtils.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySubtaskUtils.java
@@ -93,7 +93,7 @@ public class StudySubtaskUtils {
     }
   }
 
     }
   }
 

-  private static void updateUI(@NotNull Project project, @NotNull Task task, VirtualFile taskDir) {
+  public static void updateUI(@NotNull Project project, @NotNull Task task, VirtualFile taskDir) {

     StudyCheckUtils.drawAllPlaceholders(project, task, taskDir);
     ProjectView.getInstance(project).refresh();
     StudyToolWindow toolWindow = StudyUtils.getStudyToolWindow(project);
     StudyCheckUtils.drawAllPlaceholders(project, task, taskDir);
     ProjectView.getInstance(project).refresh();
     StudyToolWindow toolWindow = StudyUtils.getStudyToolWindow(project);