Skip to content

Show grey Unknown Source node in call stack ui view for stackframe without attached source #29

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
Jinbo Wang (testforstephen) merged 1 commit into from
Sep 19, 2017
Merged

Show grey Unknown Source node in call stack ui view for stackframe without attached source #29

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
6 changes: 5 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 @@ -123,7 +123,11 @@ private Types.Source convertDebuggerSourceToClient(Location location, IDebugAdap
} else {
// If the source lookup engine cannot find the source file, then lookup it in the source directories specified by user.
String absoluteSourcepath = AdapterUtils.sourceLookup(context.getSourcePaths(), relativeSourcePath);
return new Types.Source(sourceName, absoluteSourcepath, 0);
if (absoluteSourcepath != null) {
return new Types.Source(sourceName, absoluteSourcepath, 0);
} else {
return null;
}
}
}
}
13 changes: 12 additions & 1 deletion ...lugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtSourceLookUpProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,18 @@ public void acceptSearchMatch(SearchMatch match) {
Object element = match.getElement();
if (element instanceof IType) {
IType type = (IType) element;
uris.add(type.isBinary() ? getFileURI(type.getClassFile()) : getFileURI(type.getResource()));
if (type.isBinary()) {
try {
// let the search engine to ignore those class files without attached source.
if (type.getSource() != null) {
uris.add(getFileURI(type.getClassFile()));
}
} catch (JavaModelException e) {
// ignore
}
} else {
uris.add(getFileURI(type.getResource()));
}
}
}
};
Expand Down