1194fc8 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Use new `Range::line_range()` method in more places, as appropriate.

1194fc8Nathan Vegdahl5 years ago

helix-term/src/commands.rs+7−13

compare with master

unifiedsplit

@@ -1162,15 +1162,12 @@ fn extend_line(cx: &mut Context) {

1162 let text = doc.text();

1163 let range = doc.selection(view.id).primary().min_width_1(text.slice(..));

1164

1165− let start_line = text.char_to_line(range.from());

1165+ let (start_line, end_line) = range.line_range(text.slice(..));

1166− let end_line = (text.char_to_line(range.to().saturating_sub(1).max(range.from())) + count)

1167− .min(text.len_lines());

1168−

1169 let start = text.line_to_char(start_line);

1166 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()));

1171

1168

1172 if range.from() == start && range.to() == end {

1169 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()));

1174 }

1171 }

1175

1172

1176 doc.set_selection(view.id, Selection::single(start, end));

1173 doc.set_selection(view.id, Selection::single(start, end));

@@ -1184,12 +1181,9 @@ fn extend_to_line_bounds(cx: &mut Context) {

1184 doc.selection(view.id).clone().transform(|range| {

1181 doc.selection(view.id).clone().transform(|range| {

1185 let text = doc.text();

1182 let text = doc.text();

1186

1183

1187− let start_line = text.char_to_line(range.from());

1184+ let (start_line, end_line) = range.line_range(text.slice(..));

1188− let end_line = (text.char_to_line(range.to().saturating_sub(1).max(range.from())) + 1)

1189− .min(text.len_lines());

1190−

1191 let start = text.line_to_char(start_line);

1185 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()));

1193

1187

1194 if range.anchor <= range.head {

1188 if range.anchor <= range.head {

1195 Range::new(start, end)

1189 Range::new(start, end)

@@ -3111,8 +3105,8 @@ fn paste_impl(

3111 (Paste::Before, true) => text.line_to_char(text.char_to_line(range.from())),

3105 (Paste::Before, true) => text.line_to_char(text.char_to_line(range.from())),

3112 // paste linewise after

3106 // paste linewise after

3113 (Paste::After, true) => {

3107 (Paste::After, true) => {

3114− let idx = range.to().saturating_sub(1).max(range.from());

3108+ let line = range.line_range(text.slice(..)).1;

3115− text.line_to_char((text.char_to_line(idx) + 1).min(text.len_lines()))

3109+ text.line_to_char((line + 1).min(text.len_lines()))

3116 }

3110 }

3117 // paste insert

3111 // paste insert

3118 (Paste::Before, false) => range.from(),

3112 (Paste::Before, false) => range.from(),