aboutsummaryrefslogtreecommitdiff
path: root/helix-core/src
diff options
context:
space:
mode:
authorPascal Kuthe2023-03-22 17:38:32 +0000
committerBlaž Hrastnik2023-03-27 00:54:40 +0000
commit7cf448eb5bfd604e1342a1d0f5685e3231f6c1a9 (patch)
treede7af63bddff781fae751e80dfab98bb751244f3 /helix-core/src
parent72b93116784ec944f49c7f6a335b0aa663f1430e (diff)
use partition_point instead of binary_search_by
Using `partition_point` ensures we always find the first entry. With binary search it is "random" (deterministic but implementation specific) which index is retruned if there are multiple equal elements. `partition_point` was added to the standard library to cover extactly the usecase here.
Diffstat (limited to 'helix-core/src')
-rw-r--r--helix-core/src/text_annotations.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/helix-core/src/text_annotations.rs b/helix-core/src/text_annotations.rs
index 3e48de4d..e6093184 100644
--- a/helix-core/src/text_annotations.rs
+++ b/helix-core/src/text_annotations.rs
@@ -1,5 +1,4 @@
use std::cell::Cell;
-use std::convert::identity;
use std::ops::Range;
use std::rc::Rc;
@@ -113,9 +112,7 @@ impl<A, M> Layer<A, M> {
pub fn reset_pos(&self, char_idx: usize, get_char_idx: impl Fn(&A) -> usize) {
let new_index = self
.annotations
- .binary_search_by_key(&char_idx, get_char_idx)
- .unwrap_or_else(identity);
-
+ .partition_point(|annot| get_char_idx(annot) < char_idx);
self.current_index.set(new_index);
}