Provide shorter evaluation error, without the unneccessary prefix.

e-Contract · Nov 22, 2020 · bcdd20f · bcdd20f
1 parent 461dd54
commit bcdd20f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/...ugger.jpda.truffle/src/org/netbeans/modules/debugger/jpda/truffle/access/TruffleEval.java b/...ugger.jpda.truffle/src/org/netbeans/modules/debugger/jpda/truffle/access/TruffleEval.java
@@ -26,6 +26,7 @@
 import org.netbeans.api.debugger.jpda.JPDAThread;
 import org.netbeans.api.debugger.jpda.ObjectVariable;
 import org.netbeans.api.debugger.jpda.Variable;
+import org.netbeans.modules.debugger.jpda.expr.InvocationExceptionTranslated;
 import org.netbeans.modules.debugger.jpda.truffle.TruffleDebugManager;
 import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
@@ -58,6 +59,13 @@ public static Variable evaluate(JPDADebugger debugger, String expression) throws
                     new Variable[] { stackFrameInstance,
                                      mirrorExpression });
             return valueVar;
+        } catch (InvalidExpressionException ex) {
+            Throwable targetException = ex.getTargetException();
+            if (targetException instanceof InvocationExceptionTranslated) {
+                // We do not want to prepend Java exception message:
+                ((InvocationExceptionTranslated) targetException).resetInvocationMessage();
+            }
+            throw ex;
         } catch (InvalidObjectException | NoSuchMethodException ex) {
             try {
                 return debugger.createMirrorVar(ex.getLocalizedMessage());

diff --git a/...ugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/InvocationExceptionTranslated.java b/...ugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/InvocationExceptionTranslated.java
@@ -95,6 +95,10 @@ private InvocationExceptionTranslated(String invocationMessage, ObjectReference
         this.createdAt = new Throwable().fillInStackTrace();
     }
 
+    public void resetInvocationMessage() {
+        this.invocationMessage = null;
+    }
+
     public void setPreferredThread(JPDAThreadImpl preferredThread) {
         this.preferredThread = preferredThread;
     }

diff --git a/.../java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbProtocolServer.java b/.../java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbProtocolServer.java
@@ -379,13 +379,13 @@ public CompletableFuture<EvaluateResponse> evaluate(EvaluateArguments args) {
             String expression = args.getExpression();
             if (StringUtils.isBlank(expression)) {
                 throw ErrorUtilities.createResponseErrorException(
-                    "Failed to evaluate. Reason: Empty expression cannot be evaluated.",
+                    "Empty expression cannot be evaluated.",
                     ResponseErrorCode.InvalidParams);
             }
             NbFrame stackFrame = (NbFrame) context.getThreadsProvider().getThreadObjects().getObject(args.getFrameId());
             if (stackFrame == null) {
                 throw ErrorUtilities.createResponseErrorException(
-                    "Failed to evaluate. Reason: Unknown frame " + args.getFrameId(),
+                    "Unknown frame " + args.getFrameId(),
                     ResponseErrorCode.InvalidParams);
             }
             stackFrame.getDVFrame().makeCurrent(); // The evaluation is always performed with respect to the current frame
@@ -397,7 +397,7 @@ public CompletableFuture<EvaluateResponse> evaluate(EvaluateArguments args) {
                 variable = debugger.evaluate(expression);
             } catch (InvalidExpressionException ex) {
                 throw ErrorUtilities.createResponseErrorException(
-                    "Failed to evaluate. Reason: " + ex.getLocalizedMessage(),
+                    ex.getLocalizedMessage(),
                     ResponseErrorCode.ParseError);
             }
             EvaluateResponse response = new EvaluateResponse();