EDU-827 Do not open random file on creating new subtask

JetBrains · Jan 10, 2017 · d6059b2 · d6059b2
1 parent 1b91778
commit d6059b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/...urse-creator/src/com/jetbrains/edu/coursecreator/CCSubtaskEditorNotificationProvider.java b/...urse-creator/src/com/jetbrains/edu/coursecreator/CCSubtaskEditorNotificationProvider.java
@@ -196,7 +196,7 @@ public PopupStep onChosen(String selectedValue, boolean finalChoice) {
           if (activeSubtaskIndex > mySubtaskIndex) {
             myTask.setActiveSubtaskIndex(activeSubtaskIndex - 1);
           }
-          StudySubtaskUtils.updateUI(myProject, myTask, taskDir);
+          StudySubtaskUtils.updateUI(myProject, myTask, taskDir, true);
           for (VirtualFile file : FileEditorManager.getInstance(myProject).getOpenFiles()) {
             EditorNotifications.getInstance(myProject).updateNotifications(file);
           }

diff --git a/...l-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCNewSubtaskAction.java b/...l-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCNewSubtaskAction.java
@@ -60,7 +60,7 @@ public static void addSubtask(@NotNull Task task, @NotNull Project project) {
     createTestsForNewSubtask(project, task);
     int num = task.getLastSubtaskIndex() + 1;
     createTaskDescriptionFile(project, taskDir, num);
-    StudySubtaskUtils.switchStep(project, task, num);
+    StudySubtaskUtils.switchStep(project, task, num, false);
     task.setLastSubtaskIndex(num);
   }
 

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
@@ -34,10 +34,14 @@ public class StudySubtaskUtils {
   private StudySubtaskUtils() {
   }
 
+  public static void switchStep(@NotNull Project project, @NotNull Task task, int toSubtaskIndex) {
+    switchStep(project, task, toSubtaskIndex, true);
+  }
+
   /***
    * @param toSubtaskIndex from 0 to subtaskNum - 1
    */
-  public static void switchStep(@NotNull Project project, @NotNull Task task, int toSubtaskIndex) {
+  public static void switchStep(@NotNull Project project, @NotNull Task task, int toSubtaskIndex, boolean navigateToTask) {
     if (toSubtaskIndex == task.getActiveSubtaskIndex()) {
       return;
     }
@@ -79,7 +83,7 @@ public static void switchStep(@NotNull Project project, @NotNull Task task, int
     }
     transformTestFile(project, toSubtaskIndex, taskDir);
     task.setActiveSubtaskIndex(toSubtaskIndex);
-    updateUI(project, task, taskDir);
+    updateUI(project, task, taskDir, navigateToTask);
 
     for (StudySubtaskChangeListener listener : Extensions.getExtensions(StudySubtaskChangeListener.EP_NAME)) {
       listener.subtaskChanged(project, task, fromSubtaskIndex, toSubtaskIndex);
@@ -112,7 +116,7 @@ private static void transformTestFile(@NotNull Project project, int toSubtaskInd
     }
   }
 
-  public static void updateUI(@NotNull Project project, @NotNull Task task, VirtualFile taskDir) {
+  public static void updateUI(@NotNull Project project, @NotNull Task task, VirtualFile taskDir, boolean navigateToTask) {
     StudyCheckUtils.drawAllPlaceholders(project, task);
     ProjectView.getInstance(project).refresh();
     StudyToolWindow toolWindow = StudyUtils.getStudyToolWindow(project);
@@ -124,7 +128,9 @@ public static void updateUI(@NotNull Project project, @NotNull Task task, Virtua
       }
       toolWindow.setTaskText(text, taskDir, project);
     }
-    StudyNavigator.navigateToTask(project, task);
+    if (navigateToTask) {
+      StudyNavigator.navigateToTask(project, task);
+    }
   }
 
   private static void updatePlaceholderTexts(@NotNull Document document,