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

On go to next task open only task file related to the current step

Browse Source
This commit is contained in:
Ekaterina Tuzova
2016-11-25 19:31:39 +03:00
parent 6fc1f46568
commit b4503a2aa4
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java
+10 -25
View File
@@ -107,26 +107,6 @@ public class StudyNavigator {
}
}
@Nullable
public static VirtualFile getFileToActivate(@NotNull Project project, Map<String, TaskFile> nextTaskFiles, VirtualFile taskDir) {
VirtualFile fileToActivate = null;
for (Map.Entry<String, TaskFile> entry : nextTaskFiles.entrySet()) {
String name = entry.getKey();
TaskFile taskFile = entry.getValue();
VirtualFile srcDir = taskDir.findChild(EduNames.SRC);
VirtualFile vf = srcDir == null ? taskDir.findFileByRelativePath(name) : srcDir.findFileByRelativePath(name);
if (vf != null) {
if (fileToActivate != null) {
FileEditorManager.getInstance(project).openFile(vf, true);
}
if (fileToActivate == null && !taskFile.getActivePlaceholders().isEmpty()) {
fileToActivate = vf;
}
}
}
return fileToActivate != null ? fileToActivate : getFirstTaskFile(taskDir, project);
}
@Nullable
private static VirtualFile getFirstTaskFile(@NotNull final VirtualFile taskDir, @NotNull final Project project) {
for (VirtualFile virtualFile : taskDir.getChildren()) {
@@ -157,7 +137,7 @@ public class StudyNavigator {
for (VirtualFile file : FileEditorManager.getInstance(project).getOpenFiles()) {
FileEditorManager.getInstance(project).closeFile(file);
}
Map<String, TaskFile> nextTaskFiles = task.getTaskFiles();
Map<String, TaskFile> taskFiles = task.getTaskFiles();
VirtualFile taskDir = task.getTaskDir(project);
if (taskDir == null) {
return;
@@ -166,19 +146,24 @@ public class StudyNavigator {
if (srcDir != null) {
taskDir = srcDir;
}
if (nextTaskFiles.isEmpty()) {
if (taskFiles.isEmpty()) {
ProjectView.getInstance(project).select(taskDir, taskDir, false);
return;
}
for (String name : nextTaskFiles.keySet()) {
VirtualFile virtualFile = taskDir.findFileByRelativePath(name);
VirtualFile fileToActivate = getFirstTaskFile(taskDir, project);
for (Map.Entry<String, TaskFile> entry : taskFiles.entrySet()) {
final TaskFile taskFile = entry.getValue();
if (taskFile.getActivePlaceholders().isEmpty()) {
continue;
}
VirtualFile virtualFile = taskDir.findFileByRelativePath(entry.getKey());
if (virtualFile == null) {
continue;
}
FileEditorManager.getInstance(project).openFile(virtualFile, true);
fileToActivate = virtualFile;
}
EduUsagesCollector.taskNavigation();
VirtualFile fileToActivate = getFileToActivate(project, nextTaskFiles, taskDir);
if (fileToActivate != null) {
updateProjectView(project, fileToActivate);
}