mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-08 18:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Add a horizontal separator between history and query file finder matches

Browse source
This commit is contained in:
Kirill Bulatov 2023-12-23 22:33:52 +02:00
parent 1f603afbc1
commit 1096eeff3a
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/file_finder2/src/file_finder.rs
View file

@ -544,6 +544,15 @@ impl PickerDelegate for FileFinderDelegate {
cx.notify();
}
fn separators_after_indices(&self) -> Vec<usize> {
let history_items = self.matches.history.len();
if history_items == 0 {
Vec::new()
} else {
vec![history_items - 1]
}
}
fn update_matches(
&mut self,
raw_query: String,

8
crates/picker2/src/picker2.rs
View file

@ -5,7 +5,7 @@ use gpui::{
UniformListScrollHandle, View, ViewContext, WindowContext,
};
use std::{cmp, sync::Arc};
use ui::{prelude::*, v_stack, Color, Divider, Label, ListItem, ListItemSpacing};
use ui::{prelude::*, v_stack, Color, Divider, Label, ListItem, ListItemSpacing, ListSeparator};
use workspace::ModalView;
pub struct Picker<D: PickerDelegate> {
@ -26,6 +26,9 @@ pub trait PickerDelegate: Sized + 'static {
type ListItem: IntoElement;
fn match_count(&self) -> usize;
fn selected_index(&self) -> usize;
fn separators_after_indices(&self) -> Vec<usize> {
Vec::new()
}
fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>);
fn placeholder_text(&self) -> Arc<str>;
@ -266,6 +269,7 @@ impl<D: PickerDelegate> Render for Picker<D> {
"candidates",
self.delegate.match_count(),
{
let separators_after_indices = self.delegate.separators_after_indices();
let selected_index = self.delegate.selected_index();
move |picker, visible_range, cx| {
visible_range
@ -285,7 +289,7 @@ impl<D: PickerDelegate> Render for Picker<D> {
ix,
ix == selected_index,
cx,
))
)).when(separators_after_indices.contains(&ix), |picker| picker.child(ListSeparator))
})
.collect()
}