From 21bb609b079fc178bc6283d7e10a6c7d8e3f71eb Mon Sep 17 00:00:00 2001 From: Riccardo Mazzarini Date: Thu, 23 Nov 2023 13:31:17 +0100 Subject: [PATCH] fzf-v1: re-implement it using `Candidate` --- src/algos/fzf/fzf_v1.rs | 84 +++++++++++++++++++---------------------- src/candidate.rs | 26 +++++++++++++ 2 files changed, 64 insertions(+), 46 deletions(-) diff --git a/src/algos/fzf/fzf_v1.rs b/src/algos/fzf/fzf_v1.rs index 7956a03..bb6e97b 100644 --- a/src/algos/fzf/fzf_v1.rs +++ b/src/algos/fzf/fzf_v1.rs @@ -115,7 +115,7 @@ impl Fzf for FzfV1 { fn fuzzy( &mut self, pattern: Pattern, - _candidate: Candidate, + candidate: Candidate, _ranges: &mut MatchedRanges, ) -> Option { // TODO: can we remove this? @@ -129,17 +129,17 @@ impl Fzf for FzfV1 { CaseSensitivity::Smart => pattern.has_uppercase, }; - let _opts = CandidateOpts::new(is_sensitive, self.normalization); + let opts = CandidateOpts::new(is_sensitive, self.normalization); + + let range_forward = forward_pass(pattern, candidate, opts)?; + + let start_backward = + backward_pass(pattern, candidate, range_forward.end, opts); + + let range = range_forward.start + start_backward..range_forward.end; todo!(); - // let range_forward = forward_pass(pattern, candidate, opts)?; - // - // let start_backward = - // backward_pass(pattern, &candidate[range_forward.clone()], opts); - // - // let range = range_forward.start + start_backward..range_forward.end; - // // let score = // calculate_score(pattern, candidate, range, opts, scheme, ranges_buf); // @@ -151,17 +151,21 @@ impl Fzf for FzfV1 { #[inline] fn forward_pass( pattern: Pattern, - mut candidate: &str, - opts: impl Opts, + candidate: Candidate, + opts: CandidateOpts, ) -> Option> { let mut pattern_chars = pattern.chars(); let mut pattern_char = pattern_chars.next()?; - let (start_offset, matched_char_byte_len) = - opts.find_first(pattern_char, candidate)?; + let start_offset = candidate.find_first_from( + 0, + pattern_char, + opts.is_case_sensitive, + opts.char_eq, + )?; - let mut end_offset = start_offset + matched_char_byte_len; + let mut end_offset = start_offset + 1; if let Some(next) = pattern_chars.next() { pattern_char = next; @@ -169,25 +173,19 @@ fn forward_pass( return Some(start_offset..end_offset); } - // SAFETY: todo. - candidate = unsafe { candidate.get_unchecked(end_offset..) }; - loop { - let (byte_offset, matched_char_byte_len) = - opts.find_first(pattern_char, candidate)?; - - end_offset += byte_offset + matched_char_byte_len; + end_offset = candidate.find_first_from( + end_offset, + pattern_char, + opts.is_case_sensitive, + opts.char_eq, + )? + 1; if let Some(next) = pattern_chars.next() { pattern_char = next; } else { return Some(start_offset..end_offset); } - - // SAFETY: todo. - candidate = unsafe { - candidate.get_unchecked(byte_offset + matched_char_byte_len..) - }; } } @@ -195,36 +193,30 @@ fn forward_pass( #[inline] fn backward_pass( pattern: Pattern, - mut candidate: &str, - opts: impl Opts, + candidate: Candidate, + end_offset: usize, + opts: CandidateOpts, ) -> usize { - // The candidate must start with the first character of the query. - debug_assert!(opts.char_eq( - pattern.chars().next().unwrap(), - candidate.chars().next().unwrap(), - )); - - // The candidate must end with the last character of the query. - debug_assert!(opts.char_eq( - pattern.chars().next_back().unwrap(), - candidate.chars().next_back().unwrap(), - )); - let mut pattern_chars = pattern.chars().rev(); let mut pattern_char = pattern_chars.next().expect("pattern is not empty"); + let mut start_offset = end_offset; + loop { - let (byte_offset, _) = - opts.find_last(pattern_char, candidate).unwrap(); + start_offset = candidate + .find_last_from( + start_offset, + pattern_char, + opts.is_case_sensitive, + opts.char_eq, + ) + .unwrap(); if let Some(next) = pattern_chars.next() { pattern_char = next; } else { - return byte_offset; + return start_offset; } - - // SAFETY: todo. - candidate = unsafe { candidate.get_unchecked(..byte_offset) }; } } diff --git a/src/candidate.rs b/src/candidate.rs index 9d1eb6c..6f5c9fe 100644 --- a/src/candidate.rs +++ b/src/candidate.rs @@ -77,6 +77,32 @@ impl<'a> Candidate<'a> { } } + /// TODO: docs + #[inline(always)] + pub fn find_last_from( + &self, + end_offset: usize, + ch: char, + is_case_sensitive: bool, + char_eq: CharEq, + ) -> Option { + match self { + Candidate::Ascii(slice) => { + if ch.is_ascii() { + let slice = &slice[..end_offset]; + find_last_ascii(ch as _, slice, is_case_sensitive) + } else { + None + } + }, + + Candidate::Unicode(slice) => { + let slice = &slice[..end_offset]; + find_last_unicode(ch, slice, char_eq) + }, + } + } + /// TODO: docs #[inline(always)] pub fn matches(