added the line_end helper function

3 files changed, 9 insertions, 5 deletions

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 9ac506a6..d99bb66d 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -114,6 +114,6 @@ pub use state::State;
 
 pub use line_ending::{
     auto_detect_line_ending, get_line_ending, rope_slice_to_line_ending, LineEnding,
-    DEFAULT_LINE_ENDING,
+    DEFAULT_LINE_ENDING, line_end
 };
 pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};
diff --git a/helix-core/src/line_ending.rs b/helix-core/src/line_ending.rs
index 33f8d078..f6118493 100644
--- a/helix-core/src/line_ending.rs
+++ b/helix-core/src/line_ending.rs
@@ -111,6 +111,12 @@ pub fn get_line_ending(line: &RopeSlice) -> Option<LineEnding> {
     str_to_line_ending(g2).or_else(|| str_to_line_ending(g1))
 }
 
+pub fn line_end(slice: &RopeSlice, line: usize) -> usize {
+    slice.line_to_char(line + 1).saturating_sub(get_line_ending(&slice.line(line))
+        .map(|le| le.len_chars())
+        .unwrap_or(0))
+}
+
 #[cfg(target_os = "windows")]
 pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;
 #[cfg(not(target_os = "windows"))]
diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index cf7ea854..a3cd9b96 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -5,7 +5,7 @@ use ropey::iter::Chars;
 use crate::{
     coords_at_pos,
     graphemes::{nth_next_grapheme_boundary, nth_prev_grapheme_boundary},
-    pos_at_coords, Position, Range, RopeSlice, get_line_ending
+    pos_at_coords, Position, Range, RopeSlice, get_line_ending, line_end
 };
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -38,9 +38,7 @@ pub fn move_horizontally(
         }
         Direction::Forward => {
             // Line end is pos at the start of next line - 1
-            let end = slice.line_to_char(line + 1).saturating_sub(get_line_ending(&slice.line(line))
-                .map(|le| le.len_chars())
-                .unwrap_or(0));
+            let end = line_end(&slice, line);
             nth_next_grapheme_boundary(slice, pos, count).min(end)
         }
     };