Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(TUI): Fixed panic when changing order of items in TableView #3160

Merged
merged 1 commit into from
Dec 10, 2019
+3 −3
Merged

fix(TUI): Fixed panic when changing order of items in TableView #3160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/bin/tui/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ impl<T: TableViewItem<H>, H: Eq + Hash + Copy + Clone + 'static> TableView<T, H>
/// Returns the index of the currently selected item within the underlying
/// storage vector.
pub fn item(&self) -> Option<usize> {
if self.items.is_empty() {
if self.items.is_empty() || self.focus > self.rows_to_items.len() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this actually be >=?

I just happened to see the following panic locally -

thread 'main' panicked at 'index out of bounds: the len is 15 but the index is 15': /rustc/4560ea788cb760f0a34127156c78e2552949f734/src/libcore/slice/mod.rs:2717stack backtrace:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes you're right I think it should. I can do a fix for that now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If its just this one line change I think we can get it in for beta.2.
👍

None
} else {
Some(self.rows_to_items[self.focus])
Expand Down Expand Up @@ -604,7 +604,7 @@ impl<T: TableViewItem<H>, H: Eq + Hash + Copy + Clone + 'static> TableView<T, H>

fn sort_items(&mut self, column: H, order: Ordering) {
if !self.is_empty() {
let old_item = self.item().unwrap();
let old_item = self.item();

let mut rows_to_items = self.rows_to_items.clone();
rows_to_items.sort_by(|a, b| {
Expand All @@ -616,7 +616,7 @@ impl<T: TableViewItem<H>, H: Eq + Hash + Copy + Clone + 'static> TableView<T, H>
});
self.rows_to_items = rows_to_items;

self.set_selected_item(old_item);
old_item.map(|o| self.set_selected_item(o));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that's really nice - just using map() rather than an if let Some(x) = old_item { ... }.

}
}

Expand Down