Better EDT error placement.

sampottinger · sampottinger · commit f2646c44c3a1 · 2023-08-20T14:01:56.000-07:00
diff --git a/app/src/processing/app/syntax/PdeTextAreaPainter.java b/app/src/processing/app/syntax/PdeTextAreaPainter.java
@@ -151,7 +151,8 @@ protected void paintErrorLine(Graphics gfx, int line, int x) {
       int lineOffsetStop = textArea.getLineStopOffset(line);
 
       int wiggleStart = lineOffsetStart + problem.getStartOffset();
-      int wiggleStop = lineOffsetStart + problem.getStopOffset();
+      int stopOffset = Editor.getProblemEditorLineStop(problem, lineOffsetStart, lineOffsetStop);
+      int wiggleStop = lineOffsetStart + stopOffset;
 
       int y = textArea.lineToY(line) + getLineDisplacement();
 
@@ -330,7 +331,8 @@ public String getToolTipText(MouseEvent event) {
         int lineEnd = textArea.getLineStopOffset(line);
 
         int errorStart = lineStart + problem.getStartOffset();
-        int errorEnd = lineStart + problem.getStopOffset();
+        int stopOffsetLine = Editor.getProblemEditorLineStop(problem, lineStart, lineEnd);
+        int errorEnd = lineStart + stopOffsetLine;
 
         int startOffset = Math.max(errorStart, lineStart) - lineStart;
         int stopOffset = Math.min(errorEnd, lineEnd) - lineStart;
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -1028,6 +1028,16 @@ static public void showChanges() {
     }
   }
 
+  static public int getProblemEditorLineStop(Problem problem, int lineStart, int lineStop) {
+    int stopOffset = problem.getStopOffset();
+    System.out.println("> " + lineStart + " " + lineStop + " " + stopOffset);
+    if (stopOffset == -1) {
+      stopOffset = lineStop - lineStart;
+    }
+    System.out.println("< " + lineStart + " " + lineStop + " " + stopOffset);
+    return stopOffset;
+  }
+
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
@@ -2563,8 +2573,11 @@ public void highlight(Problem p) {
     int tabIndex = p.getTabIndex();
     int lineNumber = p.getLineNumber();
     int lineStart = textarea.getLineStartOffset(lineNumber);
+    int lineEnd = textarea.getLineStopOffset(lineNumber);
     int tabToStartOffset = lineStart + p.getStartOffset();
-    int tabToStopOffset = lineStart + p.getStopOffset();
+
+    int lineStopOffset = getProblemEditorLineStop(p, lineStart, lineEnd);
+    int tabToStopOffset = lineStart + lineStopOffset;
     highlight(tabIndex, tabToStartOffset, tabToStopOffset);
   }
 
@@ -2631,7 +2644,8 @@ public List<Problem> findProblems(int line) {
         .filter(p -> {
           int pStartLine = p.getLineNumber();
           int lineOffset = textarea.getLineStartOffset(pStartLine);
-          int pEndOffset = lineOffset + p.getStopOffset();
+          int stopOffset = p.getStopOffset();
+          int pEndOffset = lineOffset + (stopOffset == -1 ? 0 : stopOffset);
           int pEndLine = textarea.getLineOfOffset(pEndOffset);
           
           return line >= pStartLine && line <= pEndLine;
diff --git a/java/src/processing/mode/java/ErrorChecker.java b/java/src/processing/mode/java/ErrorChecker.java
@@ -199,7 +199,7 @@ static private JavaProblem convertIProblem(IProblem iproblem, PreprocSketch ps)
       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, iproblem.getSourceEnd() - iproblem.getSourceStart());
+      p.setPDEOffsets(0, -1);
       return p;
     }
     return null;
diff --git a/java/src/processing/mode/java/lsp/PdeAdapter.java b/java/src/processing/mode/java/lsp/PdeAdapter.java
@@ -110,6 +110,12 @@ static Offset toLineCol(String s, int offset) {
     return new Offset(line, col);
   }
 
+  static Offset toLineEndCol(String s, int offset) {
+    Offset before = toLineCol(s, offset);
+    int remaining = s.substring(offset).indexOf('\n');
+    return new Offset(before.line, before.col + remaining);
+  }
+
   
   /**
    * Converts a tabOffset to a position within a tab
@@ -232,21 +238,32 @@ void updateProblems(List<Problem> problems) {
         int startOffset = prob.getStartOffset();
         int endOffset = prob.getStopOffset();
 
+        Position startPosition = new Position(
+          prob.getLineNumber(),
+          PdeAdapter
+            .toLineCol(code.getProgram(), startOffset)
+            .col - 1
+        );
+
+        Position stopPosition;
+        if (endOffset == -1) {
+          stopPosition = new Position(
+            prob.getLineNumber(),
+            PdeAdapter
+              .toLineEndCol(code.getProgram(), startOffset)
+              .col - 1
+          );
+        } else {
+          stopPosition = new Position(
+            prob.getLineNumber(),
+            PdeAdapter
+              .toLineCol(code.getProgram(), endOffset)
+              .col - 1
+          );
+        }
+
         Diagnostic dia = new Diagnostic(
-          new Range(
-            new Position(
-              prob.getLineNumber(),
-              PdeAdapter
-                .toLineCol(code.getProgram(), startOffset)
-                .col - 1
-            ),
-            new Position(
-              prob.getLineNumber(),
-              PdeAdapter
-                .toLineCol(code.getProgram(), endOffset)
-                .col - 1
-            )
-          ),
+          new Range(startPosition, stopPosition),
           prob.getMessage()
         );
         dia.setSeverity(

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ static private JavaProblem convertIProblem(IProblem iproblem, PreprocSketch ps)`
`199`	`199`	`String badCode = ps.getPdeCode(in);`
`200`	`200`	`int line = ps.tabOffsetToTabLine(in.tabIndex, in.startTabOffset);`
`201`	`201`	`JavaProblem p = JavaProblem.fromIProblem(iproblem, in.tabIndex, line, badCode);`
`202`		`- p.setPDEOffsets(0, iproblem.getSourceEnd() - iproblem.getSourceStart());`
	`202`	`+ p.setPDEOffsets(0, -1);`
`203`	`203`	`return p;`
`204`	`204`	`}`
`205`	`205`	`return null;`