diff options
author | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-06-08 04:12:58 +0530 |
---|---|---|
committer | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-06-08 05:04:40 +0530 |
commit | f9a9cdf9f827a5e08b1bcc6035f908fdb971c9fd (patch) | |
tree | 63ce753de98a285c69e8ae4837c771cc5c17ab9a /src/interactive/widgets/mark.rs | |
parent | eae992fbf0b0f0adaf8feffcb0e4903deabc562e (diff) |
Pune/India: Don't try to go down as marked items are removed
Diffstat (limited to 'src/interactive/widgets/mark.rs')
-rw-r--r-- | src/interactive/widgets/mark.rs | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs index 3156ad3..a25465c 100644 --- a/src/interactive/widgets/mark.rs +++ b/src/interactive/widgets/mark.rs @@ -95,22 +95,17 @@ impl MarkPane { fn remove_selected_and_move_down(&mut self) { if let Some(selected) = self.selected { - let idx = { - self.marked - .iter() - .sorted_by_key(|(_, v)| &v.index) - .skip(selected) - .map(|(k, _)| k) - .next() - .cloned() - }; - if let Some(idx) = idx { + let sorted_entries: Vec<_> = self + .marked + .iter() + .sorted_by_key(|(_, v)| &v.index) + .collect(); + if let Some(idx) = sorted_entries.get(selected).map(|(k, _)| *k.to_owned()) { self.marked.remove(&idx); - self.change_selection(CursorDirection::Down); } } } - + fn change_selection(&mut self, direction: CursorDirection) { self.selected = self.selected.map(|selected| { direction |