Skip to content

Send logpoint messages to the debug console #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
testforstephen merged 3 commits into from
Mar 23, 2022
+9 −2
Merged

Send logpoint messages to the debug console #402

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a50c28e
Send logpoint messages as protocol events
sbj42 Mar 16, 2022
31f3876
Use OutputEvent for logpoint messages
sbj42 Mar 22, 2022
3f1e347
Merge branch 'main' into sbj42/logpoint-log-to-debug-console
testforstephen Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -222,6 +223,11 @@ 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(new Events.LogpointEvent(message));
Comment thread
sbj42 marked this conversation as resolved.
Outdated
}
}
return true;
} else {
Expand Down
13 changes: 13 additions & 0 deletions ...icrosoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Events.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,19 @@ public UserNotificationEvent(NotificationType notifyType, String message) {
}
}

public static class LogpointEvent extends DebugEvent {

public String message;

/**
* Constructor.
*/
public LogpointEvent(String message) {
super("logpoint");
this.message = message;
}
}

public static enum InvalidatedAreas {
@SerializedName("all")
ALL,
Expand Down
4 changes: 2 additions & 2 deletions ...in/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 + "\"";
}
}

Expand Down