eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3848 from JakubValtar/multiline-wiggly-underlines

Browse Source 
Multiline wiggly underlines
This commit is contained in:
Ben Fry
2015-09-21 23:02:15 -04:00
parent e2fe488561 ca0fd8c848
commit b93fca9f95
3 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/src/processing/mode/java/JavaEditor.java
View File

@@ -2479,6 +2479,27 @@ public class JavaEditor extends Editor {
}
/**
* @return the LineMarker for the first error or warning on 'line'
*/
public LineMarker findError(int line) {
List<LineMarker> errorPoints = getErrorPoints();
JavaTextArea textArea = getJavaTextArea();
synchronized (errorPoints) {
for (LineMarker emarker : errorPoints) {
Problem p = emarker.getProblem();
int pStartLine = p.getLineNumber();
int pEndOffset = textArea.getLineStartOffset(pStartLine) + p.getPDELineStopOffset() + 1;
int pEndLine = textArea.getLineOfOffset(pEndOffset);
if (line >= pStartLine && line <= pEndLine) {
return emarker;
}
}
}
return null;
}
/*
public void clearErrorPoints() {
List<LineMarker> errorPoints = getErrorPoints();

22
java/src/processing/mode/java/pdex/ErrorCheckerService.java
View File

@@ -1064,20 +1064,16 @@ public class ErrorCheckerService implements Runnable {
// editor.statusNotice("Position: " +
// editor.getTextArea().getCaretLine());
if (JavaMode.errorCheckEnabled) {
List<LineMarker> errorPoints = editor.getErrorPoints();
synchronized (errorPoints) {
for (LineMarker emarker : errorPoints) {
if (emarker.getProblem().getLineNumber() == editor.getTextArea().getCaretLine()) {
if (emarker.getType() == LineMarker.WARNING) {
editor.statusMessage(emarker.getProblem().getMessage(),
JavaEditor.STATUS_INFO);
} else {
editor.statusMessage(emarker.getProblem().getMessage(),
JavaEditor.STATUS_COMPILER_ERR);
}
return;
}
LineMarker errorMarker = editor.findError(editor.getTextArea().getCaretLine());
if (errorMarker != null) {
if (errorMarker.getType() == LineMarker.WARNING) {
editor.statusMessage(errorMarker.getProblem().getMessage(),
JavaEditor.STATUS_INFO);
} else {
editor.statusMessage(errorMarker.getProblem().getMessage(),
JavaEditor.STATUS_COMPILER_ERR);
}
return;
}
}

90
java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
View File

@@ -74,25 +74,8 @@ public class JavaTextAreaPainter extends TextAreaPainter
protected Color gutterTextColor;
protected Color gutterLineHighlightColor;
public static class ErrorLineCoord {
public int xStart;
public int xEnd;
public int yStart;
public int yEnd;
public Problem problem;
public ErrorLineCoord(int xStart, int xEnd, int yStart, int yEnd, Problem problem) {
this.xStart = xStart;
this.xEnd = xEnd;
this.yStart = yStart;
this.yEnd = yEnd;
this.problem = problem;
}
}
public List<ErrorLineCoord> errorLineCoords = new ArrayList<>();
public JavaTextAreaPainter(JavaTextArea textArea, TextAreaDefaults defaults) {
public JavaTextAreaPainter(final JavaTextArea textArea, TextAreaDefaults defaults) {
super(textArea, defaults);
addMouseListener(new MouseAdapter() {
@@ -134,11 +117,28 @@ public class JavaTextAreaPainter extends TextAreaPainter
addMouseMotionListener(new MouseMotionAdapter() {
@Override
public void mouseMoved(final MouseEvent evt) {
for (ErrorLineCoord coord : errorLineCoords) {
if (evt.getX() >= coord.xStart && evt.getX() <= coord.xEnd &&
evt.getY() >= coord.yStart && evt.getY() <= coord.yEnd + 2) {
setToolTipText(coord.problem.getMessage());
break;
int line = textArea.yToLine(evt.getY());
int x = evt.getX();
LineMarker marker = getJavaEditor().findError(line);
if (marker != null) {
Problem problem = marker.getProblem();
int lineOffset = textArea.getLineStartOffset(problem.getLineNumber());
int lineStart = textArea.getLineStartOffset(line);
int lineEnd = textArea.getLineStopOffset(line);
int errorStart = lineOffset + problem.getPDELineStartOffset();
int errorEnd = lineOffset + problem.getPDELineStopOffset() + 1;
int startOffset = Math.max(errorStart, lineStart) - lineStart;
int stopOffset = Math.min(errorEnd, lineEnd) - lineStart;
if (x >= getTextArea().offsetToX(line, startOffset) &&
x <= getTextArea().offsetToX(line, stopOffset)) {
setToolTipText(problem.getMessage());
evt.consume();
}
}
}
@@ -337,22 +337,6 @@ public class JavaTextAreaPainter extends TextAreaPainter
}
/**
* @return the LineMarker for the first error or warning on 'line'
*/
private LineMarker findError(int line) {
List<LineMarker> errorPoints = getJavaEditor().getErrorPoints();
synchronized (errorPoints) {
for (LineMarker emarker : errorPoints) {
if (emarker.getProblem().getLineNumber() == line) {
return emarker;
}
}
}
return null;
}
/**
* Paints the underline for an error/warning line
*
@@ -369,22 +353,29 @@ public class JavaTextAreaPainter extends TextAreaPainter
return;
}
errorLineCoords.clear();
LineMarker marker = findError(line);
LineMarker marker = getJavaEditor().findError(line);
if (marker != null) {
Problem problem = marker.getProblem();
int offset = textArea.getLineStartOffset(problem.getLineNumber());
int startOffset = offset + problem.getPDELineStartOffset();
int stopOffset = offset + problem.getPDELineStopOffset() + 1;
int lineOffset = textArea.getLineStartOffset(line);
int wiggleStart = Math.max(startOffset, lineOffset);
int wiggleStop = Math.min(stopOffset, textArea.getLineStopOffset(line));
int y = textArea.lineToY(line) + fm.getLeading() + fm.getMaxDescent();
int start = textArea.getLineStartOffset(line) + problem.getPDELineStartOffset();
int length = 1 + problem.getPDELineStopOffset() - problem.getPDELineStartOffset();
try {
String badCode = null;
String goodCode = null;
try {
SyntaxDocument doc = textArea.getDocument();
badCode = doc.getText(start, length);
goodCode = doc.getText(textArea.getLineStartOffset(line), problem.getPDELineStartOffset());
badCode = doc.getText(wiggleStart, wiggleStop - wiggleStart);
goodCode = doc.getText(lineOffset, wiggleStart - lineOffset);
//log("paintErrorLine() LineText GC: " + goodCode);
//log("paintErrorLine() LineText BC: " + badCode);
} catch (BadLocationException bl) {
@@ -402,12 +393,14 @@ public class JavaTextAreaPainter extends TextAreaPainter
int rw = fm.stringWidth(badCode.trim()); // real width
int x1 = fm.stringWidth(goodCode) + (aw - rw);
int y1 = y + fm.getHeight() - 2, x2 = x1 + rw;
if (line != problem.getLineNumber()) {
x1 = 0; // on the following lines, wiggle extends to the left border
}
// Adding offsets for the gutter
x1 += Editor.LEFT_GUTTER;
x2 += Editor.LEFT_GUTTER;
errorLineCoords.add(new ErrorLineCoord(x1, x2, y, y1, problem));
gfx.setColor(errorUnderlineColor);
if (marker.getType() == LineMarker.WARNING) {
gfx.setColor(warningUnderlineColor);
@@ -480,7 +473,8 @@ public class JavaTextAreaPainter extends TextAreaPainter
return super.getToolTipText(event);
}
if (!(Character.isLetterOrDigit(s.charAt(x)) ||
s.charAt(x) == '_' || s.charAt(x) == '$')) {
s.charAt(x) == '_' || s.charAt(x) == '$' || s.charAt(x) == '{' ||
s.charAt(x) == '}')) {
setToolTipText(null);
return super.getToolTipText(event);
}