From 444cd0b068f5a838caeeb7aa9c2d570fa330ce97 Mon Sep 17 00:00:00 2001 From: ahkrr Date: Sat, 5 Jun 2021 16:25:45 +0200 Subject: fix: make find_prev_char and till_prev_char work Bevore this PR `commands::find_prev_char` and `commands::till_prev_char` were triggerable through keys but `seach::find_nth_next()` was hardcoded in `_find_char`. The passed `fn` was nerver used. With this PR the passed `fn` is used. The change in search.rs resolves an off by one error in the behivor of `find_nth_prev` --- helix-core/src/search.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'helix-core/src') diff --git a/helix-core/src/search.rs b/helix-core/src/search.rs index 55f7bf1d..7dd2f4fc 100644 --- a/helix-core/src/search.rs +++ b/helix-core/src/search.rs @@ -41,7 +41,8 @@ pub fn find_nth_prev( inclusive: bool, ) -> Option { // start searching right before pos - let mut chars = text.chars_at(pos.saturating_sub(1)); + pos = pos.saturating_sub(1); + let mut chars = text.chars_at(pos); for _ in 0..n { loop { @@ -56,7 +57,7 @@ pub fn find_nth_prev( } if !inclusive { - pos -= 1; + pos += 1; } Some(pos) -- cgit v1.2.3-70-g09d2