673338b · helix · git.iko.soy

on master help sign in

Use `Range::line_range()` in some more places I missed.

673338bNathan Vegdahl5 years ago

helix-term/src/commands.rs+3−5

@@ -3238,8 +3238,7 @@ fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {

3238

3239 // Get all line numbers

3240 for range in doc.selection(view_id) {

3241− let start = doc.text().char_to_line(range.from());

3241+ let (start, end) = range.line_range(doc.text().slice(..));

3242− let end = doc.text().char_to_line(range.to());

3243

3242

3244 for line in start..=end {

3243 for line in start..=end {

3245 lines.push(line)

3244 lines.push(line)

@@ -3367,10 +3366,9 @@ fn join_selections(cx: &mut Context) {

3367 let fragment = Tendril::from(" ");

3366 let fragment = Tendril::from(" ");

3368

3367

3369 for selection in doc.selection(view.id) {

3368 for selection in doc.selection(view.id) {

3370− let start = text.char_to_line(selection.from());

3371− let mut end = text.char_to_line(selection.to());

3369+ let (start, mut end) = selection.line_range(slice);

3372 if start == end {

3370 if start == end {

3373− end += 1

3371+ end = (end + 1).min(text.len_lines() - 1);

3374 }

3372 }

3375 let lines = start..end;

3373 let lines = start..end;

3376

3374