From d2262f912d06bb0acd6bf398e44fec42441be47d Mon Sep 17 00:00:00 2001
From: Sam Pottinger <sam.pottinger@berkeley.edu>
Date: Sun, 16 Jul 2023 19:56:45 -0700
Subject: [PATCH] Clean up for #752.

---
 java/src/processing/mode/java/JavaEditor.java |  2 +-
 .../processing/mode/java/PreprocService.java  | 29 ++-----------
 .../processing/mode/java/ProblemFactory.java  | 43 -------------------
 3 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 198c1150c..338a6bd29 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -118,7 +118,7 @@ public class JavaEditor extends Editor {
     // setting breakpoints will flag sketch as modified, so override this here
     getSketch().setModified(false);
 
-    preprocService = new PreprocService(this.jmode, this.sketch, this); 
+    preprocService = new PreprocService(this.jmode, this.sketch); 
 
 //    long t5 = System.currentTimeMillis();
 
diff --git a/java/src/processing/mode/java/PreprocService.java b/java/src/processing/mode/java/PreprocService.java
index 3d59032b6..718728d41 100644
--- a/java/src/processing/mode/java/PreprocService.java
+++ b/java/src/processing/mode/java/PreprocService.java
@@ -93,8 +93,6 @@ public class PreprocService {
   private volatile boolean running;
   private CompletableFuture<PreprocSketch> preprocessingTask = new CompletableFuture<>();
 
-  private JavaEditor editor;
-
   private CompletableFuture<?> lastCallback =
     new CompletableFuture<>() {{
       complete(null); // initialization block
@@ -114,21 +112,6 @@ public class PreprocService {
     preprocessingThread.start();
   }
 
-  /**
-   * Create a new preprocessing service to support an editor.
-   */
-  public PreprocService(JavaMode javaMode, Sketch sketch, JavaEditor editor) {
-    this.javaMode = javaMode;
-    this.sketch = sketch;
-    this.editor = editor;
-
-    // Register listeners for first run
-    whenDone(this::fireListeners);
-
-    preprocessingThread = new Thread(this::mainLoop, "ECS");
-    preprocessingThread.start();
-  }
-
   /**
    * The "main loop" for the background thread that checks for code issues.
    */
@@ -431,15 +414,9 @@ public class PreprocService {
     final int endNumLines = numLines;
 
     if (preprocessorResult.getPreprocessIssues().size() > 0) {
-      if (editor == null) {
-        preprocessorResult.getPreprocessIssues().stream()
-          .map((x) -> ProblemFactory.build(x, tabLineStarts))
-          .forEach(result.otherProblems::add);
-      } else {
-        preprocessorResult.getPreprocessIssues().stream()
-          .map((x) -> ProblemFactory.build(x, tabLineStarts, endNumLines, editor))
-          .forEach(result.otherProblems::add);
-      }
+      preprocessorResult.getPreprocessIssues().stream()
+        .map((x) -> ProblemFactory.build(x, tabLineStarts))
+        .forEach(result.otherProblems::add);
 
       result.hasSyntaxErrors = true;
     }
diff --git a/java/src/processing/mode/java/ProblemFactory.java b/java/src/processing/mode/java/ProblemFactory.java
index ac93afd86..fd038a0a8 100644
--- a/java/src/processing/mode/java/ProblemFactory.java
+++ b/java/src/processing/mode/java/ProblemFactory.java
@@ -14,49 +14,6 @@ import processing.mode.java.preproc.PdePreprocessIssue;
  */
 public class ProblemFactory {
 
-  /**
-   * Create a new {Problem}.
-   *
-   * @param pdePreprocessIssue The preprocess issue found.
-   * @param tabStarts The list of line numbers on which each tab starts.
-   * @param editor The editor in which errors will appear.
-   * @return Newly created problem.
-   */
-  public static Problem build(PdePreprocessIssue pdePreprocessIssue, List<Integer> tabStarts,
-      int numLines, Editor editor) {
-
-    int line = pdePreprocessIssue.getLine();
-
-    // Sometimes errors are reported one line past end of sketch. Fix that.
-    if (line >= numLines) {
-      line = numLines - 1;
-    }
-
-    // Get local area
-    TabLine tabLine = getTab(tabStarts, line);
-
-    int tab = tabLine.getTab();
-    int localLine = tabLine.getLineInTab(); // Problems emitted in 0 index
-
-    // Generate syntax problem
-    String message = pdePreprocessIssue.getMsg();
-
-    int lineStart = editor.getLineStartOffset(localLine);
-    int lineStop = editor.getLineStopOffset(localLine) - 1;
-
-    if (lineStart == lineStop) {
-      lineStop++;
-    }
-
-    return new SyntaxProblem(
-        tab,
-        localLine,
-        message,
-        0,
-        lineStop - lineStart
-    );
-  }
-
   /**
    * Create a new {Problem}.
    *