Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve error mesage on save, add current field content #4710

Merged
merged 3 commits into from
Mar 3, 2019
Merged

Improve error mesage on save, add current field content #4710

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b42ccca
Improve error mesage on save, add current field content
Siedlerchr Mar 2, 2019
6681d79
fix spaces around plus sign
Siedlerchr Mar 3, 2019
5dce546
fix formatting
Siedlerchr Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions src/main/java/org/jabref/logic/bibtex/LatexFieldFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class LatexFieldFormatter {
private final FieldContentParser parser;
private StringBuilder stringBuilder;


public LatexFieldFormatter(LatexFieldFormatterPreferences prefs) {
this(true, prefs);
}
Expand All @@ -48,26 +47,26 @@ private static void checkBraces(String text) throws InvalidFieldValueException {
char item = text.charAt(i);

boolean charBeforeIsEscape = false;
if (i > 0 && text.charAt(i - 1) == '\\') {
if ((i > 0) && (text.charAt(i - 1) == '\\')) {
charBeforeIsEscape = true;
}

if (!charBeforeIsEscape && item == '{') {
if (!charBeforeIsEscape && (item == '{')) {
left++;
} else if (!charBeforeIsEscape && item == '}') {
} else if (!charBeforeIsEscape && (item == '}')) {
right++;
}
}

// Then we throw an exception if the error criteria are met.
if (!(right == 0) && (left == 0)) {
throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely.");
throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely. Field value: " + text);
}
if (!(right == 0) && (right < left)) {
throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely.");
throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely. Field value: " + text);
}
if (left != right) {
throw new InvalidFieldValueException("Braces don't match.");
throw new InvalidFieldValueException("Braces don't match. Field value: " + text);
}
}

Expand Down Expand Up @@ -146,9 +145,9 @@ private String formatAndResolveStrings(String content, String fieldName) throws
pos1 = content.length(); // just write out the rest of the text, and throw no exception
} else {
throw new InvalidFieldValueException(
"The # character is not allowed in BibTeX strings unless escaped as in '\\#'.\n"
+ "In JabRef, use pairs of # characters to indicate a string.\n"
+ "Note that the entry causing the problem has been selected.");
"The # character is not allowed in BibTeX strings unless escaped as in '\\#'.\n"
+ "In JabRef, use pairs of # characters to indicate a string.\n"
+ "Note that the entry causing the problem has been selected. Field value: " + content);
}
}
}
Expand All @@ -161,7 +160,7 @@ private String formatAndResolveStrings(String content, String fieldName) throws
// an occurrence of ## will simply be ignored. Should it instead
// cause an error message?
writeStringLabel(content, pos1 + 1, pos2, pos1 == pivot,
(pos2 + 1) == content.length());
(pos2 + 1) == content.length());
}

if (pos2 > -1) {
Expand All @@ -187,16 +186,15 @@ private boolean shouldResolveStrings(String fieldName) {
} else {
// Default operation - we only resolve strings for standard fields:
resolveStrings = InternalBibtexFields.isStandardField(fieldName)
|| BIBTEX_STRING.equals(fieldName);
|| BIBTEX_STRING.equals(fieldName);
}
return resolveStrings;
}

private String formatWithoutResolvingStrings(String content, String fieldName) throws InvalidFieldValueException {
checkBraces(content);

stringBuilder = new StringBuilder(
String.valueOf(FIELD_START));
stringBuilder = new StringBuilder(String.valueOf(FIELD_START));

stringBuilder.append(parser.format(content, fieldName));

Expand Down Expand Up @@ -258,7 +256,7 @@ private void writeText(String text, int startPos, int endPos) {
// We add a backslash before any ampersand characters, with one exception: if
// we are inside an \\url{...} command, we should write it as it is. Maybe.
if ((c == '&') && !escape && !(inCommand && "url".equals(commandName.toString()))
&& (nestedEnvironments == 0)) {
&& (nestedEnvironments == 0)) {
stringBuilder.append("\\&");
} else {
stringBuilder.append(c);
Expand All @@ -271,7 +269,7 @@ private void writeText(String text, int startPos, int endPos) {
private void writeStringLabel(String text, int startPos, int endPos,
boolean first, boolean last) {
putIn((first ? "" : " # ") + text.substring(startPos, endPos)
+ (last ? "" : " # "));
+ (last ? "" : " # "));
}

private void putIn(String s) {
Expand Down