Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid optional on select_match

Browse source
This commit is contained in:
Conrad Irwin 2023-07-17 12:02:10 -06:00
parent f887a17ffe
commit c9bf407431
6 changed files with 80 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/workspace/src/searchable.rs
View file

@ -57,19 +57,19 @@ pub trait SearchableItem: Item {
matches: &Vec<Self::Match>,
current_index: usize,
direction: Direction,
count: Option<usize>,
count: usize,
_: &mut ViewContext<Self>,
) -> usize {
match direction {
Direction::Prev => {
let count = count.unwrap_or(1) % matches.len();
let count = count % matches.len();
if current_index >= count {
current_index - count
} else {
matches.len() - (count - current_index)
}
}
Direction::Next => (current_index + count.unwrap_or(1)) % matches.len(),
Direction::Next => (current_index + count) % matches.len(),
}
}
fn find_matches(
@ -108,7 +108,7 @@ pub trait SearchableItemHandle: ItemHandle {
matches: &Vec<Box<dyn Any + Send>>,
current_index: usize,
direction: Direction,
count: Option<usize>,
count: usize,
cx: &mut WindowContext,
) -> usize;
fn find_matches(
@ -179,7 +179,7 @@ impl<T: SearchableItem> SearchableItemHandle for ViewHandle<T> {
matches: &Vec<Box<dyn Any + Send>>,
current_index: usize,
direction: Direction,
count: Option<usize>,
count: usize,
cx: &mut WindowContext,
) -> usize {
let matches = downcast_matches(matches);