suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a scrolling crash where it would jump past the end of the buffer.

pull/11/head
Blaž Hrastnik 2021-03-22 18:06:52 +09:00
parent 73c92a0bc1
commit d0530fb839
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helix-core/src/auto_pairs.rs
View File

@ -54,6 +54,7 @@ fn next_char(doc: &Rope, pos: usize) -> Option<char> {
} }
Some(doc.char(pos)) Some(doc.char(pos))
} }
// TODO: selections should be extended if range, moved if point.
// TODO: if not cursor but selection, wrap on both sides of selection (surround) // TODO: if not cursor but selection, wrap on both sides of selection (surround)
fn handle_open( fn handle_open(

2
helix-term/src/commands.rs
View File

@ -433,7 +433,7 @@ fn scroll(view: &mut View, offset: usize, direction: Direction) {
// clamp into viewport // clamp into viewport
let line = (view.first_line + cursor_off).clamp( let line = (view.first_line + cursor_off).clamp(
view.first_line + scrolloff, view.first_line + scrolloff,
view.first_line + view.last_line().saturating_sub(scrolloff), view.last_line().saturating_sub(scrolloff),
); );
let pos = pos_at_coords(text, Position::new(line, cursor.col)); // this func will properly truncate to line end let pos = pos_at_coords(text, Position::new(line, cursor.col)); // this func will properly truncate to line end