Skip to content

Mark native frames and unavailable methods as subtle #409

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 1 commit into from
Jun 8, 2022
Merged

Mark native frames and unavailable methods as subtle #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion ...src/main/java/com/microsoft/java/debug/core/adapter/handler/StackTraceRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ private Types.StackFrame convertDebuggerStackFrameToClient(StackFrame stackFrame
String methodName = formatMethodName(method, true, true);
int lineNumber = AdapterUtils.convertLineNumber(location.lineNumber(), context.isDebuggerLinesStartAt1(), context.isClientLinesStartAt1());
// Line number returns -1 if the information is not available; specifically, always returns -1 for native methods.
String presentationHint = null;
if (lineNumber < 0) {
presentationHint = "subtle";
if (method.isNative()) {
// For native method, display a tip text "native method" in the Call Stack View.
methodName += "[native method]";
Expand All @@ -105,7 +107,7 @@ private Types.StackFrame convertDebuggerStackFrameToClient(StackFrame stackFrame
clientSource = null;
}
}
return new Types.StackFrame(frameId, methodName, clientSource, lineNumber, context.isClientColumnsStartAt1() ? 1 : 0);
return new Types.StackFrame(frameId, methodName, clientSource, lineNumber, context.isClientColumnsStartAt1() ? 1 : 0, presentationHint);
}

private Types.Source convertDebuggerSourceToClient(Location location, IDebugAdapterContext context) throws URISyntaxException {
Expand Down
8 changes: 7 additions & 1 deletion ...microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public static class StackFrame {
public int line;
public int column;
public String name;
public String presentationHint;


/**
* Constructs a StackFrame with the given information.
Expand All @@ -57,13 +59,17 @@ public static class StackFrame {
* line number of the stack frame
* @param col
* column number of the stack frame
* @param presentationHint
* An optional hint for how to present this frame in the UI.
* Values: 'normal', 'label', 'subtle'
*/
public StackFrame(int id, String name, Source src, int ln, int col) {
public StackFrame(int id, String name, Source src, int ln, int col, String presentationHint) {
this.id = id;
this.name = name;
this.source = src;
this.line = ln;
this.column = col;
this.presentationHint = presentationHint;
}
}

Expand Down