Skip to content

Fix the step-into target on multi line expression. Fix #519 #520

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 4 commits into from
Jan 30, 2024
Merged

Fix the step-into target on multi line expression. Fix #519 #520

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ec67a0
Fix the step-into target on multi line expression. Fix #519
gayanper Nov 25, 2023
d52f8ba
Update StepRequestHandler.java
testforstephen Jan 30, 2024
efb32a6
Update MethodInvocationLocator.java
testforstephen Jan 30, 2024
ae6aa8e
Merge branch 'main' into multiline_statement_stepin
testforstephen Jan 30, 2024
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
Prev Previous commit
Next Next commit
Update MethodInvocationLocator.java 
fix the comment
  • Loading branch information
@testforstephen
testforstephen authored Jan 30, 2024
commit efb32a645d282f878f3a7d4055f88c9f59c3d2e6
8 changes: 2 additions & 6 deletions ...lugin/src/main/java/com/microsoft/java/debug/plugin/internal/MethodInvocationLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ public boolean visit(MethodDeclaration node) {

@Override
public boolean visit(TypeDeclaration node) {
// when root type declaration doesn't ends with a empty line, the end position
// for the root type returned from getLineNumber becomes -1. Therefore the
// shouldVisitNode fails, so the extra check unit.getRoot() == node.getRoot() is
// added.
return unit.getRoot() == node.getRoot() || shouldVisitNode(node);
return shouldVisitNode(node);
}

@Override
Expand Down Expand Up @@ -221,7 +217,7 @@ public boolean visit(ClassInstanceCreation node) {

private boolean shouldVisitNode(ASTNode node) {
int start = unit.getLineNumber(node.getStartPosition());
int end = unit.getLineNumber(node.getStartPosition() + node.getLength());
int end = unit.getLineNumber(node.getStartPosition() + node.getLength() - 1);

if (line >= start && line <= end) {
return true;
Expand Down