Skip to content

Handle empty match list and do safe vector selection instead of slicing (#50232) (cherry-pick to stable) #50233

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

Merged
zed-zippy merged 1 commit into from
Feb 26, 2026
Merged

Handle empty match list and do safe vector selection instead of slicing (#50232) (cherry-pick to stable) #50233

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
30 changes: 23 additions & 7 deletions crates/dev_container/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,20 @@ impl PickerDelegate for TemplatePickerDelegate {
) {
let fun = &mut self.on_confirm;

if self.matching_indices.is_empty() {
return;
}
self.stateful_modal
.update(cx, |modal, cx| {
fun(
self.candidate_templates[self.matching_indices[self.selected_index]].clone(),
modal,
window,
cx,
);
let Some(confirmed_entry) = self
.matching_indices
.get(self.selected_index)
.and_then(|ix| self.candidate_templates.get(*ix))
else {
log::error!("Selected index not in range of known matches");
return;
};
fun(confirmed_entry.clone(), modal, window, cx);
})
.ok();
}
Expand Down Expand Up @@ -476,7 +482,17 @@ impl PickerDelegate for FeaturePickerDelegate {
})
.ok();
} else {
let current = &mut self.candidate_features[self.matching_indices[self.selected_index]];
if self.matching_indices.is_empty() {
return;
}
let Some(current) = self
.matching_indices
.get(self.selected_index)
.and_then(|ix| self.candidate_features.get_mut(*ix))
else {
log::error!("Selected index not in range of matches");
return;
};
current.toggle_state = match current.toggle_state {
ToggleState::Selected => {
self.template_entry
Expand Down