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

tab_switcher: Preserve selected position on closed tabs (#22861)

Browse source 
When the user closes a tab, the tab switcher will now select the tab at
the same position. This feature is especially relevant for keyboard
users when you want to close multiple consecutive tabs with
`<Ctrl-Backspace>`.

Please see the discussion at
https://github.com/zed-industries/zed/discussions/22791 for full
motivation and the quick demo.

Release Notes:

- tab_switcher: Preserve selected position when tab is closed
This commit is contained in:
Andrew Borg (Kashin) 2025-01-20 12:15:25 +00:00 • committed by GitHub
parent 938b7bb183
commit 571275e6c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 77 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

52
crates/tab_switcher/src/tab_switcher.rs
View file

@ -185,11 +185,7 @@ impl TabSwitcherDelegate {
PaneEvent::AddItem { .. }
| PaneEvent::RemovedItem { .. }
| PaneEvent::Remove { .. } => tab_switcher.picker.update(cx, |picker, cx| {
let selected_item_id = picker.delegate.selected_item_id();
picker.delegate.update_matches(cx);
if let Some(item_id) = selected_item_id {
picker.delegate.select_item(item_id, cx);
}
cx.notify();
}),
_ => {}
@ -199,6 +195,7 @@ impl TabSwitcherDelegate {
}
fn update_matches(&mut self, cx: &mut WindowContext) {
let selected_item_id = self.selected_item_id();
self.matches.clear();
let Some(pane) = self.pane.upgrade() else {
return;
@ -236,13 +233,7 @@ impl TabSwitcherDelegate {
a_score.cmp(&b_score)
});
if self.matches.len() > 1 {
if self.select_last {
self.selected_index = self.matches.len() - 1;
} else {
self.selected_index = 1;
}
}
self.selected_index = self.compute_selected_index(selected_item_id);
}
fn selected_item_id(&self) -> Option<EntityId> {
@ -251,17 +242,34 @@ impl TabSwitcherDelegate {
.map(|tab_match| tab_match.item.item_id())
}
fn select_item(
&mut self,
item_id: EntityId,
cx: &mut ViewContext<Picker<TabSwitcherDelegate>>,
) {
let selected_idx = self
.matches
.iter()
.position(|tab_match| tab_match.item.item_id() == item_id)
.unwrap_or(0);
self.set_selected_index(selected_idx, cx);
fn compute_selected_index(&mut self, prev_selected_item_id: Option<EntityId>) -> usize {
if self.matches.is_empty() {
return 0;
}
if let Some(selected_item_id) = prev_selected_item_id {
// If the previously selected item is still in the list, select its new position.
if let Some(item_index) = self
.matches
.iter()
.position(|tab_match| tab_match.item.item_id() == selected_item_id)
{
return item_index;
}
// Otherwise, try to preserve the previously selected index.
return self.selected_index.min(self.matches.len() - 1);
}
if self.select_last {
return self.matches.len() - 1;
}
if self.matches.len() > 1 {
// Index 0 is active, so don't preselect it for switching.
return 1;
}
0
}
fn close_item_at(&mut self, ix: usize, cx: &mut ViewContext<Picker<TabSwitcherDelegate>>) {