Merge pull request #5486 from JakubValtar/fix-status-exception

benfry · web-flow · commit 108f5ccf0f21 · 2019-01-18T08:28:52.000-08:00
Fix sketch exception getting hidden by warning
diff --git a/app/src/processing/app/RunnerListenerEdtAdapter.java b/app/src/processing/app/RunnerListenerEdtAdapter.java
@@ -0,0 +1,48 @@
+package processing.app;
+
+import java.awt.EventQueue;
+
+public class RunnerListenerEdtAdapter implements RunnerListener {
+
+  private RunnerListener wrapped;
+
+  public RunnerListenerEdtAdapter(RunnerListener wrapped) {
+    this.wrapped = wrapped;
+  }
+
+  @Override
+  public void statusError(String message) {
+    EventQueue.invokeLater(() -> wrapped.statusError(message));
+  }
+
+  @Override
+  public void statusError(Exception exception) {
+    EventQueue.invokeLater(() -> wrapped.statusError(exception));
+  }
+
+  @Override
+  public void statusNotice(String message) {
+    EventQueue.invokeLater(() -> wrapped.statusNotice(message));
+  }
+
+  @Override
+  public void startIndeterminate() {
+    EventQueue.invokeLater(() -> wrapped.startIndeterminate());
+  }
+
+  @Override
+  public void stopIndeterminate() {
+    EventQueue.invokeLater(() -> wrapped.stopIndeterminate());
+  }
+
+  @Override
+  public void statusHalt() {
+    EventQueue.invokeLater(() -> wrapped.statusHalt());
+  }
+
+  @Override
+  public boolean isHalted() {
+    return wrapped.isHalted();
+  }
+}
+
diff --git a/app/src/processing/app/SketchException.java b/app/src/processing/app/SketchException.java
@@ -130,6 +130,11 @@ public void hideStackTrace() {
   }
 
 
+  public boolean isStackTraceEnabled() {
+    return showStackTrace;
+  }
+
+
   /**
    * Nix the java.lang crap out of an exception message
    * because it scares the children.
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -2900,6 +2900,17 @@ public void statusError(Exception e) {
 
     if (e instanceof SketchException) {
       SketchException re = (SketchException) e;
+
+      // Make sure something is printed into the console
+      // Status bar is volatile
+      if (!re.isStackTraceEnabled()) {
+        System.err.println(re.getMessage());
+      }
+
+      // Move the cursor to the line before updating the status bar, otherwise
+      // status message might get hidden by a potential message caused by moving
+      // the cursor to a line with warning in it
+
       if (re.hasCodeIndex()) {
         sketch.setCurrentCode(re.getCodeIndex());
       }
diff --git a/java/src/processing/mode/java/Debugger.java b/java/src/processing/mode/java/Debugger.java
@@ -39,6 +39,7 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 
 import processing.app.Messages;
+import processing.app.RunnerListenerEdtAdapter;
 import processing.app.Sketch;
 import processing.app.SketchCode;
 import processing.mode.java.debug.*;
@@ -201,7 +202,7 @@ public synchronized void startDebug() {
         //lineMap = LineMapping.generateMapping(srcPath + File.separator + mainClassName + ".java");
 
         log("launching debuggee runtime");
-        runtime = new Runner(build, editor);
+        runtime = new Runner(build, new RunnerListenerEdtAdapter(editor));
         VirtualMachine vm = runtime.debug(null); // non-blocking
         if (vm == null) {
           loge("error 37: launch failed", null);
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
@@ -1094,10 +1094,11 @@ protected void handleLaunch(boolean present, boolean tweak) {
         synchronized (runtimeLock) {
           if (runtimeLaunchRequested) {
             runtimeLaunchRequested = false;
+            RunnerListener listener = new RunnerListenerEdtAdapter(JavaEditor.this);
             if (!tweak) {
-              runtime = jmode.handleLaunch(sketch, JavaEditor.this, present);
+              runtime = jmode.handleLaunch(sketch, listener, present);
             } else {
-              runtime = jmode.handleTweak(sketch, JavaEditor.this);
+              runtime = jmode.handleTweak(sketch, listener);
             }
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -1094,10 +1094,11 @@ protected void handleLaunch(boolean present, boolean tweak) {`
`1094`	`1094`	`synchronized (runtimeLock) {`
`1095`	`1095`	`if (runtimeLaunchRequested) {`
`1096`	`1096`	`runtimeLaunchRequested = false;`
	`1097`	`+ RunnerListener listener = new RunnerListenerEdtAdapter(JavaEditor.this);`
`1097`	`1098`	`if (!tweak) {`
`1098`		`- runtime = jmode.handleLaunch(sketch, JavaEditor.this, present);`
	`1099`	`+ runtime = jmode.handleLaunch(sketch, listener, present);`
`1099`	`1100`	`} else {`
`1100`		`- runtime = jmode.handleTweak(sketch, JavaEditor.this);`
	`1101`	`+ runtime = jmode.handleTweak(sketch, listener);`
`1101`	`1102`	`}`
`1102`	`1103`	`}`
`1103`	`1104`	`}`