andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-26 11:23:31 +04:00
Code Issues Projects Releases Wiki Activity

Make scrolling extend in extend mode

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-08-20 13:42:01 +09:00
parent 07fea61d03
commit a76ec9a64e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,12 +882,11 @@ fn switch_to_lowercase(cx: &mut Context) {
pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) { pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
use Direction::*; use Direction::*;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let cursor = coords_at_pos(
doc.text().slice(..), let range = doc.selection(view.id).primary();
doc.selection(view.id) let text = doc.text().slice(..);
.primary()
.cursor(doc.text().slice(..)), let cursor = coords_at_pos(text, range.cursor(text));
);
let doc_last_line = doc.text().len_lines().saturating_sub(1); let doc_last_line = doc.text().len_lines().saturating_sub(1);
let last_line = view.last_line(doc); let last_line = view.last_line(doc);
@ -917,11 +916,16 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
.max(view.offset.row + scrolloff) .max(view.offset.row + scrolloff)
.min(last_line.saturating_sub(scrolloff)); .min(last_line.saturating_sub(scrolloff));
let text = doc.text().slice(..); let head = pos_at_coords(text, Position::new(line, cursor.col), true); // this func will properly truncate to line end
let pos = pos_at_coords(text, Position::new(line, cursor.col), true); // this func will properly truncate to line end
let anchor = if doc.mode == Mode::Select {
range.anchor
} else {
head
};
// TODO: only manipulate main selection // TODO: only manipulate main selection
doc.set_selection(view.id, Selection::point(pos)); doc.set_selection(view.id, Selection::single(anchor, head));
} }
fn page_up(cx: &mut Context) { fn page_up(cx: &mut Context) {