Merge pull request #937 from e1dem/fix825

Fix #825 - Showing wrong errors' line numbers for .java files

Author: Stefterv

Diff for: java/src/processing/mode/java/ErrorChecker.java

@@ -194,14 +194,29 @@ static private boolean isIgnorableProblem(IProblem iproblem) {
 
 
   static private JavaProblem convertIProblem(IProblem iproblem, PreprocSketch ps) {
-    SketchInterval in = ps.mapJavaToSketch(iproblem);
-    if (in != SketchInterval.BEFORE_START) {
-      String badCode = ps.getPdeCode(in);
-      int line = ps.tabOffsetToTabLine(in.tabIndex, in.startTabOffset);
-      JavaProblem p = JavaProblem.fromIProblem(iproblem, in.tabIndex, line, badCode);
+    String originalFileName = new String(iproblem.getOriginatingFileName());
+    boolean isJavaTab = ps.isJavaTab(originalFileName);
+
+    // Java tabs' content isn't stored in a sketch's combined source code file,
+    // so they are processed differently
+    if (!isJavaTab) {
+      SketchInterval in = ps.mapJavaToSketch(iproblem);
+      if (in != SketchInterval.BEFORE_START) {
+        String badCode = ps.getPdeCode(in);
+        int line = ps.tabOffsetToTabLine(in.tabIndex, in.startTabOffset);
+        JavaProblem p = JavaProblem.fromIProblem(iproblem, in.tabIndex, line, badCode);
+        p.setPDEOffsets(0, -1);
+        return p;
+      }
+    } else {
+      int tabIndex = ps.getJavaTabIndex(originalFileName);
+      int line = iproblem.getSourceLineNumber() - 1;
+
+      JavaProblem p =  JavaProblem.fromIProblem(iproblem, tabIndex, line, "");
       p.setPDEOffsets(0, -1);
       return p;
     }
+
     return null;
   }
 

Diff for: java/src/processing/mode/java/PreprocSketch.java

@@ -72,6 +72,16 @@ public SketchInterval mapJavaToSketch(ASTNode node) {
   }
 
 
+  public boolean isJavaTab(String fileName) {
+    return javaFileMapping.containsKey(fileName);
+  }
+
+
+  public int getJavaTabIndex(String fileName) {
+    return javaFileMapping.get(fileName);
+  }
+
+
   public SketchInterval mapJavaToSketch(IProblem iproblem) {
     String originalFile = new String(iproblem.getOriginatingFileName());
     boolean isJavaTab = javaFileMapping.containsKey(originalFile);