Skip to content

LIL-482/create jump down to next blank line #526

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
tauraamui merged 2 commits into from
Aug 21, 2025
Merged

LIL-482/create jump down to next blank line #526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e14e461
chore(position): refactor how tohandle next blankline
tauraamui Aug 19, 2025
4ffc8d3
fix: return no distance if unnecessary
tauraamui Aug 19, 2025
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
33 changes: 18 additions & 15 deletions src/lib/buffer/buffer.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,20 @@
return none
}

fn (buffer Buffer) legacy_distance_to_next_blank_line_below(start_pos Position) ?Distance {
mut compound_y := 0

Check warning on line 561 in src/lib/buffer/buffer.v

View workflow job for this annotation

GitHub Actions / unit_tests 

unused variable: `compound_y`

Check warning on line 561 in src/lib/buffer/buffer.v

View workflow job for this annotation

GitHub Actions / unit_tests 

unused variable: `compound_y`

Check warning on line 561 in src/lib/buffer/buffer.v

View workflow job for this annotation

GitHub Actions / unit_tests 

unused variable: `compound_y`

Check warning on line 561 in src/lib/buffer/buffer.v

View workflow job for this annotation

GitHub Actions / unit_tests 

unused variable: `compound_y`
for i := start_pos.line; i < buffer.lines.len; i++ {
if i == start_pos.line {
continue
}
if buffer.lines[i].len == 0 || i + 1 == buffer.lines.len {
return start_pos.distance(Position.new(line: i, offset: 0))
}
}

return none
}

pub fn (buffer Buffer) up_to_next_blank_line(pos Position) ?Position {
match buffer.buffer_kind {
.gap_buffer {
Expand Down Expand Up @@ -611,22 +625,11 @@
return none
}

mut compound_y := 0
for i := clamped_pos.line; i < buffer.lines.len; i++ {
if i == clamped_pos.line {
continue
}
compound_y += 1
if buffer.lines[i].len == 0 {
break
}
}

if compound_y == 0 {
return none
return if distance := buffer.legacy_distance_to_next_blank_line_below(clamped_pos) {
return clamped_pos.add(distance)
} else {
none
}

return clamped_pos.add(Distance{ lines: compound_y, offset: clamped_pos.offset * -1 })
}
}
}
Expand Down
Loading