Fix EDU-702 In new recommendation latex text displays incorrectly

This commit is contained in:
Valentina Kiryushkina
2016-08-03 18:58:55 +03:00
parent 5fc33cfcce
commit 7ec3fbf850
2 changed files with 10 additions and 5 deletions
@@ -476,21 +476,26 @@ public class StudyUtils {
return null;
}
final String prefix = String.format(ourPrefix, EditorColorsManager.getInstance().getGlobalScheme().getEditorFontSize());
String text = task.getText();
if (text != null && !text.isEmpty()) {
return prefix + text + ourPostfix;
return wrapTextToDisplayLatex(text);
}
if (taskDirectory != null) {
final String taskTextFileHtml = getTaskTextFromTaskName(taskDirectory, EduNames.TASK_HTML);
if (taskTextFileHtml != null) return prefix + taskTextFileHtml + ourPostfix;
if (taskTextFileHtml != null) return wrapTextToDisplayLatex(taskTextFileHtml);
final String taskTextFileMd = getTaskTextFromTaskName(taskDirectory, EduNames.TASK_MD);
if (taskTextFileMd != null) return prefix + convertToHtml(taskTextFileMd) + ourPostfix;
if (taskTextFileMd != null) return wrapTextToDisplayLatex(convertToHtml(taskTextFileMd));
}
return null;
}
public static String wrapTextToDisplayLatex(String taskTextFileHtml) {
final String prefix = String.format(ourPrefix, EditorColorsManager.getInstance().getGlobalScheme().getEditorFontSize());
return prefix + taskTextFileHtml + ourPostfix;
}
@Nullable
private static String getTaskTextFromTaskName(@NotNull VirtualFile taskDirectory, @NotNull String taskTextFilename) {
taskDirectory.refresh(false, true);
@@ -271,7 +271,7 @@ public class EduAdaptiveStepicConnector {
}
final StudyToolWindow window = StudyUtils.getStudyToolWindow(project);
if (window != null) {
window.setTaskText(unsolvedTask.getText(), unsolvedTask.getTaskDir(project), project);
window.setTaskText(StudyUtils.wrapTextToDisplayLatex(unsolvedTask.getText()), unsolvedTask.getTaskDir(project), project);
}
}
else {