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

handle src dir correctly in project view

Browse Source
This commit is contained in:
Liana.Bakradze
2016-12-12 18:32:53 +03:00
parent bef3ed2195
commit 43b58bd706
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/src/com/jetbrains/edu/learning/projectView/CourseDirectoryNode.java
+6 -1
View File
@@ -59,7 +59,12 @@ public class CourseDirectoryNode extends StudyDirectoryNode {
if (lessons.size() == 1) {
final List<Task> tasks = lesson.getTaskList();
if (tasks.size() == 1) {
return new TaskDirectoryNode(myProject, (PsiDirectory)directory.getChildren()[0], myViewSettings, tasks.get(0));
PsiDirectory taskDirectory = (PsiDirectory)directory.getChildren()[0];
PsiDirectory srcDir = taskDirectory.findSubdirectory(EduNames.SRC);
if (srcDir != null) {
taskDirectory = srcDir;
}
return new TaskDirectoryNode(myProject, taskDirectory, myViewSettings, tasks.get(0));
}
}
return new LessonDirectoryNode(myProject, directory, myViewSettings, lesson);
python/educational-core/student/src/com/jetbrains/edu/learning/projectView/TaskDirectoryNode.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class TaskDirectoryNode extends StudyDirectoryNode {
@Override
public AbstractTreeNode modifyChildNode(AbstractTreeNode childNode) {
Object value = childNode.getValue();
if (value instanceof PsiDirectory) {
if (value instanceof PsiDirectory && !((PsiDirectory)value).getName().equals(EduNames.SRC)) {
return createChildDirectoryNode(null, (PsiDirectory)value);
}
if (value instanceof PsiElement) {