Skip to content

Don't repeat to report compile errors for logpoints and conditional bp #224

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
Andy Xu(devdiv) (andxu) merged 4 commits into from
Sep 10, 2018
Merged

Don't repeat to report compile errors for logpoints and conditional bp #224

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d59cfe
Don't repeat to report compile errors for logpoints and conditional bp
andxu Sep 9, 2018
bbfa175
Don't report compile errors if it is already reported.
andxu Sep 9, 2018
f0bbe0e
Don't report compile errors if it is already reported.
andxu Sep 9, 2018
713513e
rename firstTime and make provided value as a separated variable.
andxu Sep 10, 2018
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
15 changes: 15 additions & 0 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 @@ -120,16 +120,19 @@ private CompletableFuture<Value> evaluate(String expression, ThreadReference thr

ICompiledExpression compiledExpression = null;
ASTEvaluationEngine engine = new ASTEvaluationEngine(project, debugTarget);
boolean newExpression = false;
if (breakpoint != null) {
if (StringUtils.isNotBlank(breakpoint.getLogMessage())) {
compiledExpression = (ICompiledExpression) breakpoint.getCompiledLogpointExpression();
if (compiledExpression == null) {
newExpression = true;
compiledExpression = engine.getCompiledExpression(expression, stackframe);
breakpoint.setCompiledLogpointExpression(compiledExpression);
}
} else {
compiledExpression = (ICompiledExpression) breakpoint.getCompiledConditionalExpression();
if (compiledExpression == null) {
newExpression = true;
compiledExpression = engine.getCompiledExpression(expression, stackframe);
breakpoint.setCompiledConditionalExpression(compiledExpression);
}
Expand All @@ -139,6 +142,18 @@ private CompletableFuture<Value> evaluate(String expression, ThreadReference thr
}

if (compiledExpression.hasErrors()) {
if (!newExpression && breakpoint != null) {
if (StringUtils.isNotBlank(breakpoint.getLogMessage())) {
// for logpoint with compilation errors, don't send errors if it is already reported
Value emptyValue = thread.virtualMachine().mirrorOf("");
completableFuture.complete(emptyValue);
} else {
// for conditional bp, report true to let breakpoint hit
Value trueValue = thread.virtualMachine().mirrorOf(true);
completableFuture.complete(trueValue);
}
return completableFuture;
}
completableFuture.completeExceptionally(AdapterUtils.createUserErrorDebugException(
String.format("Cannot evaluate because of compilation error(s): %s.",
StringUtils.join(compiledExpression.getErrorMessages(), "\n")),
Expand Down