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

This patch fixes a serious bug that was causing the Debugger to point to wrong (break point) line numbers.

Browse Source
This commit is contained in:
benfry
2012-12-21 16:55:31 +00:00
parent 069476bb49
commit 54403bd4de
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,11 +73,6 @@ public class ErrorCheckerService implements Runnable{
*/
protected URL[] classpath;
/**
* P5 Preproc offset
*/
private int scPreProcOffset = 0;
/**
* Stores all Problems in the sketch
*/
@@ -656,7 +651,7 @@ public class ErrorCheckerService implements Runnable{
* Repaints the textarea if required
*/
public void updateTextAreaPainter() {
// TODO: Make this fucntion of some use
// TODO: Make this function of some use
editor.getTextArea().repaint();
currentTab = editor.getSketch().getCodeIndex(
editor.getSketch().getCurrentCode());
@@ -705,7 +700,6 @@ public class ErrorCheckerService implements Runnable{
public int[] calculateTabIndexAndLineNumber(IProblem problem) {
// String[] lines = {};// = PApplet.split(sourceString, '\n');
int codeIndex = 0;
int bigCount = 0;
int x = problem.getSourceLineNumber() - mainClassOffset;
if (x < 0) {
@@ -730,7 +724,6 @@ public class ErrorCheckerService implements Runnable{
try {
for (SketchCode sc : editor.getSketch().getCode()) {
if (sc.isExtension("pde")) {
sc.setPreprocOffset(bigCount);
int len = 0;
if (editor.getSketch().getCurrentCode().equals(sc)) {
len = Base.countLines(sc.getDocument().getText(0,
@@ -769,7 +762,6 @@ public class ErrorCheckerService implements Runnable{
}
}
bigCount += sc.getLineCount();
}
} catch (Exception e) {
System.err
@@ -804,14 +796,10 @@ public class ErrorCheckerService implements Runnable{
for (SketchCode sc : editor.getSketch().getCode()) {
if (sc.isExtension("pde")) {
sc.setPreprocOffset(scPreProcOffset);
try {
if (editor.getSketch().getCurrentCode().equals(sc)) {
// rawCode.append(sc.getDocument().getText(0,
// sc.getDocument().getLength()));
rawCode.append(scrapImportStatements(sc.getDocument()
.getText(0,
sc.getDocument()
@@ -820,7 +808,6 @@ public class ErrorCheckerService implements Runnable{
.getCodeIndex(sc)));
} else {
// rawCode.append(sc.getProgram());
rawCode.append(scrapImportStatements(sc.getProgram(), editor
.getSketch().getCodeIndex(sc)));
@@ -831,7 +818,6 @@ public class ErrorCheckerService implements Runnable{
+ e.toString());
}
rawCode.append('\n');
scPreProcOffset += sc.getLineCount();
}
}