TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix crash if appending at end of line on the last line of the file

Browse source
This commit is contained in:
Blaž Hrastnik 2021-05-18 18:17:14 +09:00
parent 9edae7e1f8
commit f99a683991
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
helix-term/src/commands.rs
View file

@ -1145,15 +1145,14 @@ pub fn prepend_to_line(cx: &mut Context) {
// A inserts at the end of each line with a selection // A inserts at the end of each line with a selection
pub fn append_to_line(cx: &mut Context) { pub fn append_to_line(cx: &mut Context) {
move_line_end(cx);
let (view, doc) = cx.current(); let (view, doc) = cx.current();
enter_insert_mode(doc); enter_insert_mode(doc);
// offset by another 1 char since move_line_end will position on the last char, we want to
// append past that
let selection = doc.selection(view.id).transform(|range| { let selection = doc.selection(view.id).transform(|range| {
let pos = range.head + 1; let text = doc.text();
let line = text.char_to_line(range.head);
// we can't use line_to_char(line + 1) - 2 because the last line might not contain \n
let pos = (text.line_to_char(line) + text.line(line).len_chars()).saturating_sub(1);
Range::new(pos, pos) Range::new(pos, pos)
}); });
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);