eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 18:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

precisise highlighting working only for specific compiler errors, needs more work

Browse Source
This commit is contained in:
Manindra Moharana
2014-06-11 00:43:32 +05:30
parent a838e8cbf3
commit 6fb0becd4b
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pdex/src/processing/mode/experimental/ErrorCheckerService.java
View File

@@ -751,7 +751,7 @@ public class ErrorCheckerService implements Runnable{
// Code in pde tabs stored as PlainDocument
PlainDocument pdeTabs[] = new PlainDocument[editor.getSketch()
.getCodeCount()];
log("calcPDEOffsetsForProbList() mco: " + mainClassOffset);
try {
javaSource.insertString(0, sourceCode, null);
for (int i = 0; i < pdeTabs.length; i++) {
@@ -803,7 +803,7 @@ public class ErrorCheckerService implements Runnable{
.getIProblem().getSourceStart()));
// astGenerator.highlightPDECode(p.getTabIndex(), p.getLineNumber(),
// pdeOffset, (prbEnd - prbStart + 1));
p.setPDEOffsets(pdeOffset, prbEnd - prbStart);
p.setPDEOffsets(pdeOffset, pdeOffset + prbEnd - prbStart);
}
} catch (BadLocationException e) {
// TODO Auto-generated catch block

21
pdex/src/processing/mode/experimental/TextAreaPainter.java
View File

@@ -325,7 +325,7 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter {
isWarning = true;
}
problem = emarker.getProblem();
log(problem.toString());
//log(problem.toString());
break;
}
}
@@ -343,12 +343,16 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter {
int start = ta.getLineStartOffset(line) + problem.getPDELineStartOffset();
int pLength = problem.getPDELineStopOffset() + 1
- problem.getPDELineStartOffset();
try {
String linetext = null;
String badCode = null;
String goodCode = null;
try {
linetext = ta.getDocument().getText(start, pLength);
log("paintErrorLine() LineText: " + linetext);
badCode = ta.getDocument().getText(start, pLength);
goodCode = ta.getDocument().getText(ta.getLineStartOffset(line),
problem.getPDELineStartOffset());
//log("paintErrorLine() LineText GC: " + goodCode);
//log("paintErrorLine() LineText BC: " + badCode);
} catch (BadLocationException bl) {
// Error in the import statements or end of code.
// System.out.print("BL caught. " + ta.getLineCount() + " ,"
@@ -358,11 +362,12 @@ public class TextAreaPainter extends processing.app.syntax.TextAreaPainter {
}
// Take care of offsets
int aw = fm.stringWidth(trimRight(linetext)) + ta.getHorizontalOffset(); // apparent width. Whitespaces
int aw = fm.stringWidth(trimRight(badCode)) + ta.getHorizontalOffset(); // apparent width. Whitespaces
// to the left of line + text
// width
int rw = fm.stringWidth(linetext.trim()); // real width
int x1 = 0 + (aw - rw), y1 = y + fm.getHeight() - 2, x2 = x1 + rw;
int rw = fm.stringWidth(badCode.trim()); // real width
int x1 = fm.stringWidth(goodCode) + (aw - rw), y1 = y + fm.getHeight()
- 2, x2 = x1 + rw;
// Adding offsets for the gutter
x1 += ta.getGutterWidth();
x2 += ta.getGutterWidth();