merge

helix-editor · Jun 23, 2021 · a2a3f0f · a2a3f0f
2 parents a8ac5b9 + 9706f11
commit a2a3f0f
Show file tree

Hide file tree

Showing 9 changed files with 234 additions and 129 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-core/src/line_ending.rs b/helix-core/src/line_ending.rs
@@ -159,6 +159,12 @@ pub fn line_end_char_index(slice: &RopeSlice, line: usize) -> usize {
             .unwrap_or(0)
 }
 
+/// Returns the char index of the end of the given RopeSlice, not including
+/// any final line ending.
+pub fn rope_end_without_line_ending(slice: &RopeSlice) -> usize {
+    slice.len_chars() - get_line_ending(slice).map(|le| le.len_chars()).unwrap_or(0)
+}
+
 #[cfg(test)]
 mod line_ending_tests {
     use super::*;

diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
@@ -352,7 +352,7 @@ pub fn select_on_matches(
 
             let start = text.byte_to_char(start_byte + mat.start());
             let end = text.byte_to_char(start_byte + mat.end());
-            result.push(Range::new(start, end - 1));
+            result.push(Range::new(start, end.saturating_sub(1)));
         }
     }