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

compute initial state of placeholder correctly

Browse Source
This commit is contained in:
liana.bakradze
2016-06-26 13:50:58 +03:00
parent 62e797f90e
commit eb3764c73f
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class CCRefactoringElementListenerProvider implements RefactoringElementL
return;
}
ApplicationManager.getApplication().runWriteAction(() -> {
VirtualFile patternFile = StudyUtils.getPatternFile(project, taskFile, oldName);
VirtualFile patternFile = StudyUtils.getPatternFile(taskFile, oldName);
if (patternFile != null) {
try {
patternFile.delete(CCRefactoringElementListenerProvider.class);
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class CCUtils {
if (child == null) {
continue;
}
Document patternDocument = StudyUtils.getPatternDocument(project, entry.getValue(), name);
Document patternDocument = StudyUtils.getPatternDocument(entry.getValue(), name);
Document document = FileDocumentManager.getInstance().getDocument(child);
if (document == null || patternDocument == null) {
return;
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java
+2 -3
View File
@@ -84,7 +84,7 @@ public class CCAddAnswerPlaceholder extends CCAnswerPlaceholderAction {
}
private static void computeInitialState(Project project, PsiFile file, TaskFile taskFile, Document document) {
Document patternDocument = StudyUtils.getPatternDocument(project, taskFile, file.getName());
Document patternDocument = StudyUtils.getPatternDocument(taskFile, file.getName());
if (patternDocument == null) {
return;
}
@@ -102,8 +102,7 @@ public class CCAddAnswerPlaceholder extends CCAnswerPlaceholderAction {
for (int i = 0; i < placeholders.size(); i++) {
AnswerPlaceholder fromPlaceholder = placeholders.get(i);
AnswerPlaceholder.MyInitialState state = fromPlaceholder.getInitialState();
taskFile.getAnswerPlaceholders().get(i).setInitialState(new AnswerPlaceholder.MyInitialState(state.getOffset(), state.getLength()));
taskFile.getAnswerPlaceholders().get(i).setInitialState(new AnswerPlaceholder.MyInitialState(fromPlaceholder.getOffset(), fromPlaceholder.getLength()));
}
}
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCHideFromStudent.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class CCHideFromStudent extends CCTaskFileActionBase {
return;
}
String name = file.getName();
VirtualFile patternFile = StudyUtils.getPatternFile(project, taskFile, name);
VirtualFile patternFile = StudyUtils.getPatternFile(taskFile, name);
ApplicationManager.getApplication().runWriteAction(() -> {
if (patternFile != null) {
try {
python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
+4 -4
View File
@@ -393,12 +393,12 @@ public class StudyUtils {
@Nullable
public static VirtualFile getPatternFile(@NotNull Project project, @NotNull TaskFile taskFile, String name) {
public static VirtualFile getPatternFile(@NotNull TaskFile taskFile, String name) {
Task task = taskFile.getTask();
String lessonDir = EduNames.LESSON + String.valueOf(task.getLesson().getIndex());
String taskDir = EduNames.TASK + String.valueOf(task.getIndex());
Course course = task.getLesson().getCourse();
File resourceFile = getCourseDirectory(project, course);
File resourceFile = new File(course.getCourseDirectory());
if (!resourceFile.exists()) {
return null;
}
@@ -411,8 +411,8 @@ public class StudyUtils {
}
@Nullable
public static Document getPatternDocument(@NotNull Project project, @NotNull final TaskFile taskFile, String name) {
VirtualFile patternFile = getPatternFile(project, taskFile, name);
public static Document getPatternDocument(@NotNull final TaskFile taskFile, String name) {
VirtualFile patternFile = getPatternFile(taskFile, name);
if (patternFile == null) {
return null;
}
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class StudyRefreshAnswerPlaceholder extends DumbAwareAction {
}
StudyEditor studyEditor = StudyUtils.getSelectedStudyEditor(project);
final StudyState studyState = new StudyState(studyEditor);
Document patternDocument = StudyUtils.getPatternDocument(project, answerPlaceholder.getTaskFile(), studyState.getVirtualFile().getName());
Document patternDocument = StudyUtils.getPatternDocument(answerPlaceholder.getTaskFile(), studyState.getVirtualFile().getName());
if (patternDocument == null) {
return;
}
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
+3 -4
View File
@@ -82,7 +82,7 @@ public class StudyRefreshTaskFileAction extends StudyActionWithShortcut {
@NotNull final Project project,
TaskFile taskFile,
String name) {
if (!resetDocument(project, document, taskFile, name)) {
if (!resetDocument(document, taskFile, name)) {
return false;
}
taskFile.getTask().setStatus(StudyStatus.Unchecked);
@@ -111,11 +111,10 @@ public class StudyRefreshTaskFileAction extends StudyActionWithShortcut {
}
private static boolean resetDocument(@NotNull final Project project,
@NotNull final Document document,
private static boolean resetDocument(@NotNull final Document document,
@NotNull final TaskFile taskFile,
String fileName) {
final Document patternDocument = StudyUtils.getPatternDocument(project, taskFile, fileName);
final Document patternDocument = StudyUtils.getPatternDocument(taskFile, fileName);
if (patternDocument == null) {
return false;
}
python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java
+3 -1
View File
@@ -99,7 +99,9 @@ public class TaskFile {
answerPlaceholderCopy.setIndex(answerPlaceholder.getIndex());
answerPlaceholderCopy.setHint(answerPlaceholder.getHint());
final AnswerPlaceholder.MyInitialState state = answerPlaceholder.getInitialState();
answerPlaceholderCopy.setInitialState(new AnswerPlaceholder.MyInitialState(state.getOffset(), state.getLength()));
if (state != null) {
answerPlaceholderCopy.setInitialState(new AnswerPlaceholder.MyInitialState(state.getOffset(), state.getLength()));
}
answerPlaceholdersCopy.add(answerPlaceholderCopy);
}
target.name = source.name;