Skip to content

Fix bug#973: breakpoints inside record don't work #370

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
Apr 21, 2021
Merged

Fix bug#973: breakpoints inside record don't work #370

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
21 changes: 16 additions & 5 deletions ...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 @@ -61,6 +61,17 @@ public class JdtSourceLookUpProvider implements ISourceLookUpProvider {
private ISourceContainer[] sourceContainers = null;

private HashMap<String, Object> options = new HashMap<String, Object>();
private String latestJavaVersion = null;
private int latestASTLevel;

public JdtSourceLookUpProvider() {
// Get the latest supported Java version by JDT tooling.
this.latestJavaVersion = JavaCore.latestSupportedJavaVersion();
// Get the mapped AST level for the latest Java version.
Map<String, String> javaOptions = JavaCore.getOptions();
javaOptions.put(JavaCore.COMPILER_SOURCE, latestJavaVersion);
this.latestASTLevel = new AST(javaOptions).apiLevel();
}

@Override
public void initialize(IDebugAdapterContext context, Map<String, Object> props) {
Expand Down Expand Up @@ -101,8 +112,7 @@ public String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) th
return new String[0];
}

// Currently the highest version the debugger supports is JavaSE-13 Edition (JLS13).
final ASTParser parser = ASTParser.newParser(AST.JLS13);
final ASTParser parser = ASTParser.newParser(this.latestASTLevel);
parser.setResolveBindings(true);
parser.setBindingsRecovery(true);
parser.setStatementsRecovery(true);
Expand Down Expand Up @@ -131,9 +141,10 @@ public String[] getFullyQualifiedName(String uri, int[] lines, int[] columns) th
* the user need specify the compiler options explicitly.
*/
Map<String, String> javaOptions = JavaCore.getOptions();
javaOptions.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_13);
javaOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_13);
javaOptions.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_13);
javaOptions.put(JavaCore.COMPILER_SOURCE, this.latestJavaVersion);
javaOptions.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, this.latestJavaVersion);
javaOptions.put(JavaCore.COMPILER_COMPLIANCE, this.latestJavaVersion);
javaOptions.put(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
parser.setCompilerOptions(javaOptions);
astUnit = (CompilationUnit) parser.createAST(null);
} else {
Expand Down