Skip to content

Commit

Permalink
Multi line error message fixed #2407
Browse files Browse the repository at this point in the history
When showing the multi line error message, the arrow ^ now points on the
right character.

#2407
  • Loading branch information
jannisCode committed Oct 25, 2024
1 parent 3ffdfe3 commit 7f97527
Showing 1 changed file with 44 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;

/**
Expand All @@ -41,11 +42,10 @@ private SearchDecoration() {
* the validation.
*/
public static boolean validateRegex(String regex, ControlDecoration targetDecoration) {
String errorMessage = getValidationError(regex);
String errorMessage = getValidationError(regex, targetDecoration.getControl());
if (errorMessage.isEmpty()) {
targetDecoration.hide();
return true;

}

Image decorationImage = FieldDecorationRegistry.getDefault()
Expand All @@ -62,21 +62,55 @@ public static boolean validateRegex(String regex, ControlDecoration targetDecora
* @return The appropriate error message if the regex is invalid or an empty
* string if the regex is valid.
*/
private static String getValidationError(String regex) {
private static String getValidationError(String regex, org.eclipse.swt.widgets.Control targetControl) {

try {
Pattern.compile(regex);
return ""; //$NON-NLS-1$

} catch (PatternSyntaxException e) {
String message = e.getLocalizedMessage();
return buildValidationErrorString(e, targetControl);
}
}

private static String buildValidationErrorString(PatternSyntaxException e, org.eclipse.swt.widgets.Control targetControl) {
GC gc = new GC(targetControl);

String description = e.getDescription();
int errorIndex = e.getIndex();
String pattern = e.getPattern();

if (errorIndex == -1) {
return description;
}
StringBuilder sBuilder = new StringBuilder();

sBuilder.append(description);
sBuilder.append(" at index ").append(errorIndex).append(System.lineSeparator()); //$NON-NLS-1$
sBuilder.append(pattern).append(System.lineSeparator());

String stringToIndexString = pattern.substring(0, errorIndex + 1);
String buildString = ""; //$NON-NLS-1$
String hairSpace = "\u200A"; //$NON-NLS-1$

int stringToIndex = gc.stringExtent(stringToIndexString).x;
String lastCharacter = stringToIndexString.substring(stringToIndexString.length() - 1);

// Only preserve the first line of the original error message.
int i = 0;
while (i < message.length() && "\n\r".indexOf(message.charAt(i)) == -1) { //$NON-NLS-1$
i++;
}
int widthLastChar = gc.stringExtent(lastCharacter).x;
int upWidth = gc.stringExtent("^").x; //$NON-NLS-1$

return message.substring(0, i);
double howFar = stringToIndex - widthLastChar / 2 - upWidth / 2;

while (gc.stringExtent(buildString).x < howFar) {
buildString += hairSpace; // $NON-NLS-1$
}
sBuilder.append(buildString);

sBuilder.append("^"); //$NON-NLS-1$
gc.dispose();

return sBuilder.toString();
}


}

0 comments on commit 7f97527

Please sign in to comment.