Send logpoint messages to the debug console (microsoft#402)

sbj42 · web-flow · commit 798d259d5078 · 2022-03-23T10:59:28.000+08:00
* Send logpoint messages as protocol events

Instead of printing them to `System.out` of the process being debugged.
This should be paired with a change in vscode-java-debug to receive
the message and send it to the vscode debug console.
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
@@ -44,6 +44,7 @@
 import com.sun.jdi.BooleanValue;
 import com.sun.jdi.Field;
 import com.sun.jdi.ObjectReference;
+import com.sun.jdi.StringReference;
 import com.sun.jdi.ReferenceType;
 import com.sun.jdi.ThreadReference;
 import com.sun.jdi.Value;
@@ -222,6 +223,12 @@ public static boolean handleEvaluationResult(IDebugAdapterContext context, Threa
                 context.getProtocolServer().sendEvent(new Events.UserNotificationEvent(
                     Events.UserNotificationEvent.NotificationType.ERROR,
                     String.format("[Logpoint] Log message '%s' error: %s", breakpoint.getLogMessage(), ex.getMessage())));
+            } else if (value != null) {
+                if (value instanceof StringReference) {
+                    String message = ((StringReference) value).value();
+                    context.getProtocolServer().sendEvent(Events.OutputEvent.createConsoleOutput(
+                        message + System.lineSeparator()));
+                }
             }
             return true;
         } else {
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
@@ -226,9 +226,9 @@ private String logMessageToExpression(String logMessage) {
         }
 
         if (arguments.size() > 0) {
-            return "System.out.println(String.format(\"" + format + "\"," + String.join(",", arguments) + "))";
+            return "String.format(\"" + format + "\"," + String.join(",", arguments) + ")";
         } else {
-            return "System.out.println(\"" + format + "\")";
+            return "\"" + format + "\"";
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -226,9 +226,9 @@ private String logMessageToExpression(String logMessage) {`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`if (arguments.size() > 0) {`
`229`		`- return "System.out.println(String.format(\"" + format + "\"," + String.join(",", arguments) + "))";`
	`229`	`+ return "String.format(\"" + format + "\"," + String.join(",", arguments) + ")";`
`230`	`230`	`} else {`
`231`		`- return "System.out.println(\"" + format + "\")";`
	`231`	`+ return "\"" + format + "\"";`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`