Skip to content

fix: use StepInTarget end line #1479

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
angelozerr merged 1 commit into from
Apr 26, 2026
Merged

fix: use StepInTarget end line #1479

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
30 changes: 22 additions & 8 deletions src/main/java/com/redhat/devtools/lsp4ij/dap/stepping/DAPStepIntoVariant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,39 @@ public DAPStepIntoVariant(@NotNull StepInTarget target,

if (document != null && line != null && column != null) {
// DAP uses 1-based line numbers
int oneBasedLine = line;
int lineNumber = oneBasedLine - 1;
int startLineNumber = line - 1;

if (lineNumber >= 0 && lineNumber < document.getLineCount()) {
int lineStartOffset = document.getLineStartOffset(lineNumber);
int lineEndOffset = document.getLineEndOffset(lineNumber);
if (startLineNumber >= 0 && startLineNumber < document.getLineCount()) {
int lineStartOffset = document.getLineStartOffset(startLineNumber);

// Column is 1-based, convert to offset
int columnOffset = column - 1;
if (columnOffset >= 0) {
int startOffset = lineStartOffset + columnOffset;

// Try to use endColumn if provided for precise range
// Calculate end offset using endLine and endColumn if provided
Integer endLine = target.getEndLine();
Integer endColumn = target.getEndColumn();
int endOffset;
if (endColumn != null && endColumn > column) {

if (endLine != null && endColumn != null) {
// Multi-line or precise single-line range
int endLineNumber = endLine - 1;
if (endLineNumber >= 0 && endLineNumber < document.getLineCount()) {
int endLineStartOffset = document.getLineStartOffset(endLineNumber);
endOffset = endLineStartOffset + (endColumn - 1);
} else {
// Fallback if endLine is invalid
int lineEndOffset = document.getLineEndOffset(startLineNumber);
endOffset = Math.min(startOffset + 20, lineEndOffset);
}
} else if (endColumn != null && endColumn > column) {
// Same line, use endColumn
int lineEndOffset = document.getLineEndOffset(startLineNumber);
endOffset = Math.min(lineStartOffset + (endColumn - 1), lineEndOffset);
} else {
// Highlight the function name (estimate ~20 chars or to end of line)
// No end info, estimate function name length
int lineEndOffset = document.getLineEndOffset(startLineNumber);
endOffset = Math.min(startOffset + 20, lineEndOffset);
}

Expand Down
Loading