@@ -1162,15 +1162,12 @@ fn extend_line(cx: &mut Context) {
11621162 let text = doc.text();
11631163 let range = doc.selection(view.id).primary().min_width_1(text.slice(..));
11641164
1165− let start_line = text.char_to_line(range.from());
1166− let end_line = (text.char_to_line(range.to().saturating_sub(1).max(range.from())) + count)
1167− .min(text.len_lines());
1168−
1165+ let (start_line, end_line) = range.line_range(text.slice(..));
11691166 let start = text.line_to_char(start_line);
1170− let mut end = text.line_to_char(end_line);
1167+ let mut end = text.line_to_char((end_line + count).min(text.len_lines()));
11711168
11721169 if range.from() == start && range.to() == end {
1173− end = text.line_to_char((end_line + 1).min(text.len_lines()));
1170+ end = text.line_to_char((end_line + count + 1).min(text.len_lines()));
11741171 }
11751172
11761173 doc.set_selection(view.id, Selection::single(start, end));
@@ -1184,12 +1181,9 @@ fn extend_to_line_bounds(cx: &mut Context) {
11841181 doc.selection(view.id).clone().transform(|range| {
11851182 let text = doc.text();
11861183
1187− let start_line = text.char_to_line(range.from());
1188− let end_line = (text.char_to_line(range.to().saturating_sub(1).max(range.from())) + 1)
1189− .min(text.len_lines());
1190−
1184+ let (start_line, end_line) = range.line_range(text.slice(..));
11911185 let start = text.line_to_char(start_line);
1192− let end = text.line_to_char(end_line);
1186+ let end = text.line_to_char((end_line + 1).min(text.len_lines()));
11931187
11941188 if range.anchor <= range.head {
11951189 Range::new(start, end)
@@ -3111,8 +3105,8 @@ fn paste_impl(
31113105 (Paste::Before, true) => text.line_to_char(text.char_to_line(range.from())),
31123106 // paste linewise after
31133107 (Paste::After, true) => {
3114− let idx = range.to().saturating_sub(1).max(range.from());
3115− text.line_to_char((text.char_to_line(idx) + 1).min(text.len_lines()))
3108+ let line = range.line_range(text.slice(..)).1;
3109+ text.line_to_char((line + 1).min(text.len_lines()))
31163110 }
31173111 // paste insert
31183112 (Paste::Before, false) => range.from(),