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

Sort tasks modal entries by last used time

Browse source
This commit is contained in:
Kirill Bulatov 2024-02-28 02:01:56 +02:00 • committed by Kirill Bulatov
parent 9f7e625d37
commit 96d9df073e
3 changed files with 82 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/tasks_ui/src/lib.rs
View file

@ -41,7 +41,7 @@ fn schedule_task(workspace: &Workspace, task: &dyn Task, cx: &mut ViewContext<'_
if let Some(spawn_in_terminal) = spawn_in_terminal {
workspace.project().update(cx, |project, cx| {
project.task_inventory().update(cx, |inventory, _| {
inventory.last_scheduled_task = Some(task.id().clone());
inventory.task_scheduled(task.id().clone());
})
});
cx.emit(workspace::Event::SpawnTask(spawn_in_terminal));

34
crates/tasks_ui/src/modal.rs
View file

@ -24,7 +24,7 @@ pub(crate) struct TasksModalDelegate {
matches: Vec<StringMatch>,
selected_index: usize,
workspace: WeakView<Workspace>,
last_prompt: String,
prompt: String,
}
impl TasksModalDelegate {
@ -35,20 +35,21 @@ impl TasksModalDelegate {
candidates: Vec::new(),
matches: Vec::new(),
selected_index: 0,
last_prompt: String::default(),
prompt: String::default(),
}
}
fn spawn_oneshot(&mut self, cx: &mut AppContext) -> Option<Arc<dyn Task>> {
let oneshot_source = self
.inventory
.update(cx, |this, _| this.source::<OneshotSource>())?;
oneshot_source.update(cx, |this, _| {
let Some(this) = this.as_any().downcast_mut::<OneshotSource>() else {
return None;
};
Some(this.spawn(self.last_prompt.clone()))
})
self.inventory
.update(cx, |inventory, _| inventory.source::<OneshotSource>())?
.update(cx, |oneshot_source, _| {
Some(
oneshot_source
.as_any()
.downcast_mut::<OneshotSource>()?
.spawn(self.prompt.clone()),
)
})
}
}
@ -132,12 +133,7 @@ impl PickerDelegate for TasksModalDelegate {
picker.delegate.candidates = picker
.delegate
.inventory
.update(cx, |inventory, cx| inventory.list_tasks(None, cx));
picker
.delegate
.candidates
.sort_by(|a, b| a.name().cmp(&b.name()));
.update(cx, |inventory, cx| inventory.list_tasks(None, true, cx));
picker
.delegate
.candidates
@ -167,7 +163,7 @@ impl PickerDelegate for TasksModalDelegate {
.update(&mut cx, |picker, _| {
let delegate = &mut picker.delegate;
delegate.matches = matches;
delegate.last_prompt = query;
delegate.prompt = query;
if delegate.matches.is_empty() {
delegate.selected_index = 0;
@ -184,7 +180,7 @@ impl PickerDelegate for TasksModalDelegate {
let current_match_index = self.selected_index();
let task = if secondary {
if !self.last_prompt.trim().is_empty() {
if !self.prompt.trim().is_empty() {
self.spawn_oneshot(cx)
} else {
None