vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Activate preview for initially selected item (#37112)

Browse source 
@JosephTLyons pointed out that it's a bit weird that we only show a
preview for items selected after the initial one, so this does it for
that too.

It makes tab switching feel even faster!

Release Notes:

- N/A

Co-authored-by: David Kleingeld <davidsk@zed.dev>
This commit is contained in:
Julia Ryan 2025-08-28 14:07:02 -07:00 committed by GitHub
parent f2e62c98d1
commit 88e8f7af68
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -360,7 +360,12 @@ impl TabSwitcherDelegate {
.detach();
}
fn update_all_pane_matches(&mut self, query: String, window: &mut Window, cx: &mut App) {
fn update_all_pane_matches(
&mut self,
query: String,
window: &mut Window,
cx: &mut Context<Picker<Self>>,
) {
let Some(workspace) = self.workspace.upgrade() else {
return;
};
@ -418,7 +423,7 @@ impl TabSwitcherDelegate {
let selected_item_id = self.selected_item_id();
self.matches = matches;
self.selected_index = self.compute_selected_index(selected_item_id);
self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
}
fn update_matches(
@ -477,7 +482,7 @@ impl TabSwitcherDelegate {
a_score.cmp(&b_score)
});
self.selected_index = self.compute_selected_index(selected_item_id);
self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
}
fn selected_item_id(&self) -> Option<EntityId> {
@ -486,7 +491,12 @@ impl TabSwitcherDelegate {
.map(|tab_match| tab_match.item.item_id())
}
fn compute_selected_index(&mut self, prev_selected_item_id: Option<EntityId>) -> usize {
fn compute_selected_index(
&mut self,
prev_selected_item_id: Option<EntityId>,
window: &mut Window,
cx: &mut Context<Picker<Self>>,
) -> usize {
if self.matches.is_empty() {
return 0;
}
@ -508,8 +518,10 @@ impl TabSwitcherDelegate {
return self.matches.len() - 1;
}
// This only runs when initially opening the picker
// Index 0 is already active, so don't preselect it for switching.
if self.matches.len() > 1 {
// Index 0 is active, so don't preselect it for switching.
self.set_selected_index(1, window, cx);
return 1;
}