Added value output to jshell

barretg · barretg · commit eb2be1d28c54 · 2024-04-17T14:29:05.000-05:00
diff --git a/drjava/src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java b/drjava/src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java
@@ -296,15 +296,26 @@ private InterpretResult interpretWithJShell(StringBuilder input_buf) throws Inte
       output_buf.setLength(output_buf.length() - 1);
     }
 
+    boolean hasError = false;
+
     //TODO Jshell adds a lot of fluff to the output, try and only get the cause of the error
     for (SnippetEvent e : events) {
       if (e.status() == Snippet.Status.REJECTED) {
         Diag diagnostics = _js.diagnostics(e.snippet()).collect(Collectors.toList()).get(0);
         output_buf.append(diagnostics.getMessage(Locale.getDefault()));
         res = InterpretResult.exception(new EvaluatorException(new Throwable(output_buf.toString())));
+        hasError = true;
+      }  else if (e.value() != null) {
+        output_buf.append(e.value()).append("\n");
       }
     }
 
+    if (!hasError && output_buf.length() > 0) {
+      // Remove the last newline character added
+      output_buf.setLength(output_buf.length() - 1);
+      res = InterpretResult.objectValue(output_buf.toString(), "JShellOutput");
+    }
+
     if (res == null) {
       //Setting InterpretResult as an object value rather than doing case work as JShell will internally keep track of state, bypassing need for us to do so
       res = InterpretResult.objectValue(output_buf.toString(), "JShellOutput");
