diff --git a/java/src/processing/mode/java/ErrorChecker.java b/java/src/processing/mode/java/ErrorChecker.java index 0a0510cde..77074c2ce 100644 --- a/java/src/processing/mode/java/ErrorChecker.java +++ b/java/src/processing/mode/java/ErrorChecker.java @@ -85,9 +85,9 @@ class ErrorChecker { Map suggCache = JavaMode.importSuggestEnabled ? new HashMap<>() : Collections.emptyMap(); - IProblem[] iproblems; + List iproblems; if (ps.compilationUnit == null) { - iproblems = new IProblem[0]; + iproblems = new ArrayList<>(); } else { iproblems = ps.iproblems; } @@ -107,7 +107,7 @@ class ErrorChecker { if (problems.isEmpty()) { AtomicReference searchClassPath = new AtomicReference<>(null); - List cuProblems = Arrays.stream(iproblems) + List cuProblems = iproblems.stream() // Filter Warnings if they are not enabled .filter(iproblem -> !(iproblem.isWarning() && !JavaMode.warningsEnabled)) // Hide a useless error which is produced when a line ends with diff --git a/java/src/processing/mode/java/PreprocSketch.java b/java/src/processing/mode/java/PreprocSketch.java index e4ab92017..dbea88b6c 100644 --- a/java/src/processing/mode/java/PreprocSketch.java +++ b/java/src/processing/mode/java/PreprocSketch.java @@ -45,7 +45,7 @@ public class PreprocSketch { public final List coreAndDefaultImports; public final List codeFolderImports; public final List otherProblems; - public final List iproblems; + public final List iproblems; public final Map javaFileMapping; @@ -74,19 +74,17 @@ public class PreprocSketch { public SketchInterval mapJavaToSketch(IProblem iproblem) { String originalFile = new String(iproblem.getOriginatingFileName()); - System.out.println("here!!"); - System.out.println(originalFile); - System.out.println(javaFileMapping.keySet()); - System.out.println(iproblem); boolean isJavaFile = javaFileMapping.containsKey(originalFile); if (isJavaFile) { + System.out.println("**-**"); + System.out.println(javaFileMapping.get(originalFile)); return new SketchInterval( javaFileMapping.get(originalFile), iproblem.getSourceStart(), iproblem.getSourceEnd() + 1, - -1, // Is outside sketch code - -1 // Is outside sketch code + iproblem.getSourceStart(), // Is outside sketch code + iproblem.getSourceEnd() + 1 // Is outside sketch code ); } else { return mapJavaToSketch( @@ -236,7 +234,7 @@ public class PreprocSketch { public final List coreAndDefaultImports = new ArrayList<>(); public final List codeFolderImports = new ArrayList<>(); public final List otherProblems = new ArrayList<>(); - public List iproblems; + public List iproblems; public Map javaFileMapping;