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

tasks: Prefer worktree tasks to global tasks in tag selection (#11427)

Browse source 
Release Notes:

- Added test indicators in Rust files, backed by task system.
This commit is contained in:
Piotr Osiewicz 2024-05-06 16:53:48 +02:00 • committed by GitHub
parent 29c675ba17
commit d4636481ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 63 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/project/src/task_inventory.rs
View file

@ -6,7 +6,7 @@ use std::{
sync::Arc,
};
use collections::{hash_map, HashMap, VecDeque};
use collections::{btree_map, BTreeMap, VecDeque};
use gpui::{AppContext, Context, Model, ModelContext};
use itertools::{Either, Itertools};
use language::Language;
@ -32,17 +32,17 @@ struct SourceInInventory {
pub enum TaskSourceKind {
/// bash-like commands spawned by users, not associated with any path
UserInput,
/// ~/.config/zed/task.json - like global files with task definitions, applicable to any path
AbsPath {
id_base: &'static str,
abs_path: PathBuf,
},
/// Tasks from the worktree's .zed/task.json
Worktree {
id: WorktreeId,
abs_path: PathBuf,
id_base: &'static str,
},
/// ~/.config/zed/task.json - like global files with task definitions, applicable to any path
AbsPath {
id_base: &'static str,
abs_path: PathBuf,
},
/// Languages-specific tasks coming from extensions.
Language { name: Arc<str> },
}
@ -197,7 +197,7 @@ impl Inventory {
}
})
.fold(
HashMap::default(),
BTreeMap::default(),
|mut tasks, (task_source_kind, resolved_task)| {
tasks.entry(&resolved_task.id).or_insert_with(|| {
(task_source_kind, resolved_task, post_inc(&mut lru_score))
@ -238,18 +238,18 @@ impl Inventory {
.into_iter()
.map(|(_, (kind, task, lru_score))| (kind.clone(), task.clone(), lru_score));
let mut tasks_by_label = HashMap::default();
let mut tasks_by_label = BTreeMap::default();
tasks_by_label = previously_spawned_tasks.into_iter().fold(
tasks_by_label,
|mut tasks_by_label, (source, task, lru_score)| {
match tasks_by_label.entry((source, task.resolved_label.clone())) {
hash_map::Entry::Occupied(mut o) => {
btree_map::Entry::Occupied(mut o) => {
let (_, previous_lru_score) = o.get();
if previous_lru_score >= &lru_score {
o.insert((task, lru_score));
}
}
hash_map::Entry::Vacant(v) => {
btree_map::Entry::Vacant(v) => {
v.insert((task, lru_score));
}
}
@ -260,7 +260,7 @@ impl Inventory {
tasks_by_label,
|mut tasks_by_label, (source, task, lru_score)| {
match tasks_by_label.entry((source, task.resolved_label.clone())) {
hash_map::Entry::Occupied(mut o) => {
btree_map::Entry::Occupied(mut o) => {
let (previous_task, _) = o.get();
let new_template = task.original_task();
if new_template.ignore_previously_resolved
@ -269,7 +269,7 @@ impl Inventory {
o.insert((task, lru_score));
}
}
hash_map::Entry::Vacant(v) => {
btree_map::Entry::Vacant(v) => {
v.insert((task, lru_score));
}
}
@ -665,13 +665,6 @@ mod tests {
});
cx.run_until_parked();
let worktree_independent_tasks = vec![
(
TaskSourceKind::AbsPath {
id_base: "test source",
abs_path: path_2.to_path_buf(),
},
common_name.to_string(),
),
(
TaskSourceKind::AbsPath {
id_base: "test source",
@ -686,6 +679,13 @@ mod tests {
},
common_name.to_string(),
),
(
TaskSourceKind::AbsPath {
id_base: "test source",
abs_path: path_2.to_path_buf(),
},
common_name.to_string(),
),
(
TaskSourceKind::AbsPath {
id_base: "test source",