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

EDU-658 Create placeholder without selection

Browse Source
This commit is contained in:
Liana Bakradze
2016-06-29 17:01:42 +03:00
parent e57d9f8862
commit af2d69ff56
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java
+13 -9
View File
@@ -54,14 +54,13 @@ public class CCAddAnswerPlaceholder extends CCAnswerPlaceholderAction {
}
final SelectionModel model = editor.getSelectionModel();
final int offset = model.getSelectionStart();
final int offset = model.hasSelection() ? model.getSelectionStart() : editor.getCaretModel().getOffset();
final AnswerPlaceholder answerPlaceholder = new AnswerPlaceholder();
answerPlaceholder.setOffset(offset);
answerPlaceholder.setUseLength(false);
String selectedText = model.getSelectedText();
answerPlaceholder.setPossibleAnswer(selectedText);
answerPlaceholder.setPossibleAnswer(model.hasSelection() ? model.getSelectedText() : EduNames.PLACEHOLDER);
CCCreateAnswerPlaceholderDialog dlg = new CCCreateAnswerPlaceholderDialog(project, answerPlaceholder);
dlg.show();
@@ -69,6 +68,10 @@ public class CCAddAnswerPlaceholder extends CCAnswerPlaceholderAction {
return;
}
if (!model.hasSelection()) {
DocumentUtil.writeInRunUndoTransparentAction(() -> document.insertString(offset, EduNames.PLACEHOLDER));
}
TaskFile taskFile = state.getTaskFile();
int index = taskFile.getAnswerPlaceholders().size() + 1;
answerPlaceholder.setIndex(index);
@@ -147,7 +150,7 @@ public class CCAddAnswerPlaceholder extends CCAnswerPlaceholderAction {
presentation.setVisible(true);
if (canAddPlaceholder(state) || canDeletePlaceholder(state)) {
presentation.setEnabled(true);
presentation.setText((state.getAnswerPlaceholder() == null ? "Add " : "Delete ") + EduNames.PLACEHOLDER);
presentation.setText((state.getAnswerPlaceholder() == null ? "Add " : "Delete ") + EduNames.ANSWER_PLACEHOLDER);
}
}
@@ -155,12 +158,13 @@ public class CCAddAnswerPlaceholder extends CCAnswerPlaceholderAction {
private static boolean canAddPlaceholder(@NotNull CCState state) {
Editor editor = state.getEditor();
SelectionModel selectionModel = editor.getSelectionModel();
if (!selectionModel.hasSelection()) {
return false;
if (selectionModel.hasSelection()) {
int start = selectionModel.getSelectionStart();
int end = selectionModel.getSelectionEnd();
return !arePlaceholdersIntersect(state.getTaskFile(), start, end);
}
int start = selectionModel.getSelectionStart();
int end = selectionModel.getSelectionEnd();
return !arePlaceholdersIntersect(state.getTaskFile(), start, end);
int offset = editor.getCaretModel().getOffset();
return state.getTaskFile().getAnswerPlaceholder(offset) == null;
}
private static boolean canDeletePlaceholder(@NotNull CCState state) {
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java
+1 -1
View File
@@ -28,7 +28,7 @@ import java.util.List;
public class CCDeleteAllAnswerPlaceholdersAction extends DumbAwareAction {
public static final String ACTION_NAME = "Delete All " + EduNames.PLACEHOLDER + "s";
public static final String ACTION_NAME = "Delete All " + EduNames.ANSWER_PLACEHOLDER + "s";
public CCDeleteAllAnswerPlaceholdersAction() {
super(ACTION_NAME);
python/educational-core/student/src/com/jetbrains/edu/learning/core/EduNames.java
+2 -1
View File
@@ -46,7 +46,8 @@ public class EduNames {
public static final String STUDY = "Study";
public static final String ADAPTIVE = "Adaptive";
public static final String PLACEHOLDER = "Answer Placeholder";
public static final String ANSWER_PLACEHOLDER = "Answer Placeholder";
public static final String PLACEHOLDER = "placeholder";
public static final String SRC = "src";
private EduNames() {
}