mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-06-10 10:46:04 +02:00
Code Issues

Use range positions to determine insert_newline motion (#9448) 

* use anchor and head positions to determine motion

* use range cursor to decide extending or shifting

* add condition to cursor moving back on normal
This commit is contained in:
Waleed Dahshan 2024-01-30 08:58:33 +11:00 committed by GitHub
parent 87a720c3a1
commit cf4492174d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3651,7 +3651,7 @@ pub fn insert_newline(cx: &mut Context) {
(pos, pos, local_offs) (pos, pos, local_offs)
}; };
let new_range = if doc.restore_cursor { let new_range = if range.cursor(text) > range.anchor {
// when appending, extend the range by local_offs // when appending, extend the range by local_offs
Range::new( Range::new(
range.anchor + global_offs, range.anchor + global_offs,

10
helix-view/src/editor.rs
View File

@ -1990,10 +1990,12 @@ pub fn enter_normal_mode(&mut self) {
if doc.restore_cursor { if doc.restore_cursor {
let text = doc.text().slice(..); let text = doc.text().slice(..);
let selection = doc.selection(view.id).clone().transform(|range| { let selection = doc.selection(view.id).clone().transform(|range| {
Range::new( let mut head = range.to();
range.from(), if range.head > range.anchor {
graphemes::prev_grapheme_boundary(text, range.to()), head = graphemes::prev_grapheme_boundary(text, head);
) }
Range::new(range.from(), head)
}); });
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);