Show tooltip in task spawn modal (#10744)
Tooltip shows original task template's label, if it differs from the one displayed in the modal. Also, a resolved command with args will be shown in the tooltip if different from the modal entry text. <img width="578" alt="Screenshot 2024-04-19 at 00 40 28" src="https://github.com/zed-industries/zed/assets/2690773/c89369d6-8ffc-4464-ab3b-ea5e8fb7625a"> <img width="761" alt="Screenshot 2024-04-19 at 00 40 32" src="https://github.com/zed-industries/zed/assets/2690773/b02f1518-976a-4a9b-ba7c-f88c6e056217"> <img width="738" alt="Screenshot 2024-04-19 at 00 40 56" src="https://github.com/zed-industries/zed/assets/2690773/be502537-f4bd-4ae0-a5e7-78e37fe8fb00"> <img width="785" alt="Screenshot 2024-04-19 at 00 41 01" src="https://github.com/zed-industries/zed/assets/2690773/9bedcd21-8729-44c8-9a17-46a5a01c7f26"> Release Notes: - Added tooltips into task spawn modal
This commit is contained in:
parent
870a61dd4d
commit
6d1ea782a4
4 changed files with 48 additions and 17 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -9736,7 +9736,6 @@ dependencies = [
|
||||||
"file_icons",
|
"file_icons",
|
||||||
"fuzzy",
|
"fuzzy",
|
||||||
"gpui",
|
"gpui",
|
||||||
"itertools 0.11.0",
|
|
||||||
"language",
|
"language",
|
||||||
"picker",
|
"picker",
|
||||||
"project",
|
"project",
|
||||||
|
|
|
@ -75,6 +75,26 @@ impl ResolvedTask {
|
||||||
pub fn substituted_variables(&self) -> &HashSet<VariableName> {
|
pub fn substituted_variables(&self) -> &HashSet<VariableName> {
|
||||||
&self.substituted_variables
|
&self.substituted_variables
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// If the resolution produced a task with the command, returns a string, combined from its command and arguments.
|
||||||
|
pub fn resolved_command(&self) -> Option<String> {
|
||||||
|
self.resolved.as_ref().map(|resolved| {
|
||||||
|
let mut command = resolved.command.clone();
|
||||||
|
for arg in &resolved.args {
|
||||||
|
command.push(' ');
|
||||||
|
command.push_str(arg);
|
||||||
|
}
|
||||||
|
command
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A human-readable label to display in the UI.
|
||||||
|
pub fn display_label(&self) -> &str {
|
||||||
|
self.resolved
|
||||||
|
.as_ref()
|
||||||
|
.map(|resolved| resolved.label.as_str())
|
||||||
|
.unwrap_or_else(|| self.resolved_label.as_str())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Variables, available for use in [`TaskContext`] when a Zed's [`TaskTemplate`] gets resolved into a [`ResolvedTask`].
|
/// Variables, available for use in [`TaskContext`] when a Zed's [`TaskTemplate`] gets resolved into a [`ResolvedTask`].
|
||||||
|
|
|
@ -25,7 +25,6 @@ util.workspace = true
|
||||||
terminal.workspace = true
|
terminal.workspace = true
|
||||||
workspace.workspace = true
|
workspace.workspace = true
|
||||||
language.workspace = true
|
language.workspace = true
|
||||||
itertools.workspace = true
|
|
||||||
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
|
|
@ -233,11 +233,7 @@ impl PickerDelegate for TasksModalDelegate {
|
||||||
.map(|(index, (_, candidate))| StringMatchCandidate {
|
.map(|(index, (_, candidate))| StringMatchCandidate {
|
||||||
id: index,
|
id: index,
|
||||||
char_bag: candidate.resolved_label.chars().collect(),
|
char_bag: candidate.resolved_label.chars().collect(),
|
||||||
string: candidate
|
string: candidate.display_label().to_owned(),
|
||||||
.resolved
|
|
||||||
.as_ref()
|
|
||||||
.map(|resolved| resolved.label.clone())
|
|
||||||
.unwrap_or_else(|| candidate.resolved_label.clone()),
|
|
||||||
})
|
})
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
})
|
})
|
||||||
|
@ -306,7 +302,28 @@ impl PickerDelegate for TasksModalDelegate {
|
||||||
) -> Option<Self::ListItem> {
|
) -> Option<Self::ListItem> {
|
||||||
let candidates = self.candidates.as_ref()?;
|
let candidates = self.candidates.as_ref()?;
|
||||||
let hit = &self.matches[ix];
|
let hit = &self.matches[ix];
|
||||||
let (source_kind, _) = &candidates.get(hit.candidate_id)?;
|
let (source_kind, resolved_task) = &candidates.get(hit.candidate_id)?;
|
||||||
|
let template = resolved_task.original_task();
|
||||||
|
let display_label = resolved_task.display_label();
|
||||||
|
|
||||||
|
let mut tooltip_label_text = if display_label != &template.label {
|
||||||
|
template.label.clone()
|
||||||
|
} else {
|
||||||
|
String::new()
|
||||||
|
};
|
||||||
|
if let Some(resolved_command) = resolved_task.resolved_command() {
|
||||||
|
if display_label != resolved_command {
|
||||||
|
if !tooltip_label_text.trim().is_empty() {
|
||||||
|
tooltip_label_text.push('\n');
|
||||||
|
}
|
||||||
|
tooltip_label_text.push_str(&resolved_command);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let tooltip_label = if tooltip_label_text.trim().is_empty() {
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
Some(Tooltip::text(tooltip_label_text, cx))
|
||||||
|
};
|
||||||
|
|
||||||
let highlighted_location = HighlightedText {
|
let highlighted_location = HighlightedText {
|
||||||
text: hit.string.clone(),
|
text: hit.string.clone(),
|
||||||
|
@ -321,10 +338,14 @@ impl PickerDelegate for TasksModalDelegate {
|
||||||
.get_type_icon(&name.to_lowercase())
|
.get_type_icon(&name.to_lowercase())
|
||||||
.map(|icon_path| Icon::from_path(icon_path)),
|
.map(|icon_path| Icon::from_path(icon_path)),
|
||||||
};
|
};
|
||||||
|
|
||||||
Some(
|
Some(
|
||||||
ListItem::new(SharedString::from(format!("tasks-modal-{ix}")))
|
ListItem::new(SharedString::from(format!("tasks-modal-{ix}")))
|
||||||
.inset(true)
|
.inset(true)
|
||||||
.spacing(ListItemSpacing::Sparse)
|
.spacing(ListItemSpacing::Sparse)
|
||||||
|
.when_some(tooltip_label, |list_item, item_label| {
|
||||||
|
list_item.tooltip(move |_| item_label.clone())
|
||||||
|
})
|
||||||
.map(|item| {
|
.map(|item| {
|
||||||
let item = if matches!(source_kind, TaskSourceKind::UserInput)
|
let item = if matches!(source_kind, TaskSourceKind::UserInput)
|
||||||
|| Some(ix) <= self.last_used_candidate_index
|
|| Some(ix) <= self.last_used_candidate_index
|
||||||
|
@ -368,18 +389,10 @@ impl PickerDelegate for TasksModalDelegate {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn selected_as_query(&self) -> Option<String> {
|
fn selected_as_query(&self) -> Option<String> {
|
||||||
use itertools::intersperse;
|
|
||||||
let task_index = self.matches.get(self.selected_index())?.candidate_id;
|
let task_index = self.matches.get(self.selected_index())?.candidate_id;
|
||||||
let tasks = self.candidates.as_ref()?;
|
let tasks = self.candidates.as_ref()?;
|
||||||
let (_, task) = tasks.get(task_index)?;
|
let (_, task) = tasks.get(task_index)?;
|
||||||
task.resolved.as_ref().map(|spawn_in_terminal| {
|
task.resolved_command()
|
||||||
let mut command = spawn_in_terminal.command.clone();
|
|
||||||
if !spawn_in_terminal.args.is_empty() {
|
|
||||||
command.push(' ');
|
|
||||||
command.extend(intersperse(spawn_in_terminal.args.clone(), " ".to_string()));
|
|
||||||
}
|
|
||||||
command
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn confirm_input(&mut self, omit_history_entry: bool, cx: &mut ViewContext<Picker<Self>>) {
|
fn confirm_input(&mut self, omit_history_entry: bool, cx: &mut ViewContext<Picker<Self>>) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue