Skip to content

fix the inconsistent uri issue for set breakpoint request #84

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
Oct 18, 2017
+19 −1
Merged

fix the inconsistent uri issue for set breakpoint request #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4637745
fix the inconsistent uri issue for set breakpoint request
testforstephen Oct 18, 2017
28b7ed6
add vscode bug number
testforstephen Oct 18, 2017
be5dcf2
fix review comments
testforstephen Oct 18, 2017
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
16 changes: 16 additions & 0 deletions ...oft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/AdapterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

package com.microsoft.java.debug.core.adapter;

import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystemNotFoundException;
import java.nio.file.Files;
Expand Down Expand Up @@ -220,4 +222,18 @@ public static String getSHA256HexDigest(String content) {
}
return buf.toString();
}

/**
* Decode the uri string.
* @param uri
* the uri string
* @return the decoded uri
*/
public static String decodeURIComponent(String uri) {
try {
return URLDecoder.decode(uri, StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
return uri;
}
}
}
4 changes: 3 additions & 1 deletion ...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 @@ -81,7 +81,9 @@ public void handle(Command command, Arguments arguments, Response response, IDeb
try {
List<Types.Breakpoint> res = new ArrayList<>();
IBreakpoint[] toAdds = this.convertClientBreakpointsToDebugger(sourcePath, bpArguments.breakpoints, context);
IBreakpoint[] added = manager.setBreakpoints(sourcePath, toAdds, bpArguments.sourceModified);
// See the VSCode bug https://github.com/Microsoft/vscode/issues/36471.
// The source uri sometimes is encoded by VSCode, the debugger will decode it to keep the uri consistent.
IBreakpoint[] added = manager.setBreakpoints(AdapterUtils.decodeURIComponent(sourcePath), toAdds, bpArguments.sourceModified);
for (int i = 0; i < bpArguments.breakpoints.length; i++) {
// For newly added breakpoint, should install it to debuggee first.
if (toAdds[i] == added[i] && added[i].className() != null) {
Expand Down