aboutsummaryrefslogtreecommitdiff
path: root/helix-core
diff options
context:
space:
mode:
Diffstat (limited to 'helix-core')
-rw-r--r--helix-core/src/search.rs26
1 files changed, 24 insertions, 2 deletions
diff --git a/helix-core/src/search.rs b/helix-core/src/search.rs
index 243ac227..81cb4129 100644
--- a/helix-core/src/search.rs
+++ b/helix-core/src/search.rs
@@ -1,6 +1,28 @@
use crate::RopeSlice;
-pub fn find_nth_next(text: RopeSlice, ch: char, mut pos: usize, n: usize) -> Option<usize> {
+// TODO: switch to std::str::Pattern when it is stable.
+pub trait CharMatcher {
+ fn char_match(&self, ch: char) -> bool;
+}
+
+impl CharMatcher for char {
+ fn char_match(&self, ch: char) -> bool {
+ *self == ch
+ }
+}
+
+impl<F: Fn(&char) -> bool> CharMatcher for F {
+ fn char_match(&self, ch: char) -> bool {
+ (*self)(&ch)
+ }
+}
+
+pub fn find_nth_next<M: CharMatcher>(
+ text: RopeSlice,
+ char_matcher: M,
+ mut pos: usize,
+ n: usize,
+) -> Option<usize> {
if pos >= text.len_chars() || n == 0 {
return None;
}
@@ -13,7 +35,7 @@ pub fn find_nth_next(text: RopeSlice, ch: char, mut pos: usize, n: usize) -> Opt
pos += 1;
- if c == ch {
+ if char_matcher.char_match(c) {
break;
}
}