mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Refactor Picker in terms of columns

Browse source 
`menu::Item` is replaced with column configurations for each picker
which control how a column is displayed and whether it is passed to
nucleo for filtering. (This is used for dynamic pickers so that we can
filter those items with the dynamic picker callback rather than nucleo.)

The picker has a new lucene-like syntax that can be used to filter the
picker only on certain criteria. If a filter is not specified, the text
in the prompt applies to the picker's configured "primary" column.

Adding column configurations for each picker is left for the child
commit.
This commit is contained in:
Michael Davis 2024-02-16 10:55:02 -05:00
parent dae3841a75
commit f40fca88e0
No known key found for this signature in database
9 changed files with 309 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

14
helix-term/src/commands.rs
View file

@ -2317,7 +2317,9 @@ fn global_search(cx: &mut Context) {
return;
}
let (picker, injector) = Picker::stream(current_path);
// TODO
let columns = vec![];
let (picker, injector) = Picker::stream(columns, current_path);
let dedup_symlinks = file_picker_config.deduplicate_links;
let absolute_root = search_root
@ -2420,6 +2422,7 @@ fn global_search(cx: &mut Context) {
let call = move |_: &mut Editor, compositor: &mut Compositor| {
let picker = Picker::with_stream(
picker,
0,
injector,
move |cx, FileResult { path, line_num }, action| {
let doc = match cx.editor.open(path, action) {
@ -2937,7 +2940,8 @@ fn buffer_picker(cx: &mut Context) {
// mru
items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
let picker = Picker::new(items, (), |cx, meta, action| {
let columns = vec![];
let picker = Picker::new(columns, 0, items, (), |cx, meta, action| {
cx.editor.switch(meta.id, action);
})
.with_preview(|editor, meta| {
@ -3014,7 +3018,10 @@ fn jumplist_picker(cx: &mut Context) {
}
};
let columns = vec![];
let picker = Picker::new(
columns,
0,
cx.editor
.tree
.views()
@ -3180,7 +3187,8 @@ pub fn command_palette(cx: &mut Context) {
}
}));
let picker = Picker::new(commands, keymap, move |cx, command, _action| {
let columns = vec![];
let picker = Picker::new(columns, 0, commands, keymap, move |cx, command, _action| {
let mut ctx = Context {
register,
count,