@@ -1100,16 +1100,18 @@ fn extend_line(cx: &mut Context) {
11001100 let count = cx.count();
11011101 let (view, doc) = current!(cx.editor);
11021102
1103− let pos = doc.selection(view.id).primary();
11041103 let text = doc.text();
1104+ let pos = doc.selection(view.id).primary().min_width_1(text.slice(..));
11051105
1106− let line_start = text.char_to_line(pos.anchor);
1107− let start = text.line_to_char(line_start);
1108− let line_end = text.char_to_line(pos.head);
1109− let mut end = line_end_char_index(&text.slice(..), line_end + count.saturating_sub(1));
1106+ let line_max = text.len_lines();
1107+ let start_line = text.char_to_line(pos.from()).min(line_max);
1108+ let end_line = (text.char_to_line(pos.to()) + count).min(line_max);
11101109
1111− if pos.anchor == start && pos.head == end && line_end < (text.len_lines() - 2) {
1112− end = line_end_char_index(&text.slice(..), line_end + 1);
1110+ let start = text.line_to_char(start_line);
1111+ let mut end = text.line_to_char(end_line);
1112+
1113+ if pos.from() == start && pos.to() == end {
1114+ end = text.line_to_char((end_line + 1).min(line_max));
11131115 }
11141116
11151117 doc.set_selection(view.id, Selection::single(start, end));