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

Added inner directories support to the educational edition

Browse Source
This commit is contained in:
Ekaterina Tuzova
2016-11-23 14:34:43 +03:00
parent 986a98eee1
commit 0935834d85
35 changed files with 247 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-python/resources/fileTemplates/internal/test_helper.py.ft
+6 -5
View File
@@ -139,12 +139,13 @@ def get_initial_text(path):
Returns the initial task text
"""
course_lib = sys.argv[-2]
test_dir = sys.argv[-3]
import os
# path format is "project_root/lessonX/taskY/file.py"
task_index = path.rfind(os.sep, 0, path.rfind(os.sep))
index = path.rfind(os.sep, 0, task_index)
relative_path = path[index + 1:]
lesson_task = os.sep.join(test_dir.split(os.sep)[-3:-1])
task_dir = os.sep.join(test_dir.split(os.sep)[:-1])
relative_path = lesson_task + os.sep + path[len(task_dir):]
# path format is "project_root/lessonX/taskY/.../file.py"
initial_file_path = os.path.join(course_lib, relative_path)
return get_file_text(initial_file_path)
python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class PyStudyCheckAction extends StudyCheckAction {
for (Map.Entry<String, TaskFile> entry : task.getTaskFiles().entrySet()) {
String name = entry.getKey();
TaskFile taskFile = entry.getValue();
VirtualFile virtualFile = taskDir.findChild(name);
VirtualFile virtualFile = taskDir.findFileByRelativePath(name);
if (virtualFile != null) {
if (!taskFile.getActivePlaceholders().isEmpty()) {
taskVirtualFile = virtualFile;