zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

repl: Show executing status at the bottom of the outputs while waiting for execution to finish (#15096)

Browse Source 
![image](https://github.com/user-attachments/assets/3b43f9d9-6456-42e2-a76a-43887d63309e)

Release Notes:

- N/A
This commit is contained in:
Kyle Kelley 2024-07-24 09:04:41 -07:00 committed by GitHub
parent 0843da0f81
commit 846fc67519
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
crates/repl/src/outputs.rs
View File

@ -512,57 +512,60 @@ impl ExecutionView {
impl Render for ExecutionView { impl Render for ExecutionView {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement { fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
let status = match &self.status {
ExecutionStatus::ConnectingToKernel => Label::new("Connecting to kernel...")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::Executing => h_flex()
.gap_2()
.child(
Icon::new(IconName::ArrowCircle)
.size(IconSize::Small)
.color(Color::Muted)
.with_animation(
"arrow-circle",
Animation::new(Duration::from_secs(3)).repeat(),
|icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
),
)
.child(Label::new("Executing...").color(Color::Muted))
.into_any_element(),
ExecutionStatus::Finished => Icon::new(IconName::Check)
.size(IconSize::Small)
.into_any_element(),
ExecutionStatus::Unknown => Label::new("Unknown status")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::ShuttingDown => Label::new("Kernel shutting down...")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::Shutdown => Label::new("Kernel shutdown")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::Queued => Label::new("Queued...")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::KernelErrored(error) => Label::new(format!("Kernel error: {}", error))
.color(Color::Error)
.into_any_element(),
};
if self.outputs.len() == 0 { if self.outputs.len() == 0 {
return v_flex() return v_flex()
.min_h(cx.line_height()) .min_h(cx.line_height())
.justify_center() .justify_center()
.child(match &self.status { .child(status)
ExecutionStatus::ConnectingToKernel => Label::new("Connecting to kernel...")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::Executing => h_flex()
.gap_2()
.child(
Icon::new(IconName::ArrowCircle)
.size(IconSize::Small)
.color(Color::Muted)
.with_animation(
"arrow-circle",
Animation::new(Duration::from_secs(3)).repeat(),
|icon, delta| {
icon.transform(Transformation::rotate(percentage(delta)))
},
),
)
.child(Label::new("Executing...").color(Color::Muted))
.into_any_element(),
ExecutionStatus::Finished => Icon::new(IconName::Check)
.size(IconSize::Small)
.into_any_element(),
ExecutionStatus::Unknown => Label::new("Unknown status")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::ShuttingDown => Label::new("Kernel shutting down...")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::Shutdown => Label::new("Kernel shutdown")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::Queued => Label::new("Queued...")
.color(Color::Muted)
.into_any_element(),
ExecutionStatus::KernelErrored(error) => {
Label::new(format!("Kernel error: {}", error))
.color(Color::Error)
.into_any_element()
}
})
.into_any_element(); .into_any_element();
} }
div() div()
.w_full() .w_full()
.children(self.outputs.iter().filter_map(|output| output.render(cx))) .children(self.outputs.iter().filter_map(|output| output.render(cx)))
.children(match self.status {
ExecutionStatus::Executing => vec![status],
ExecutionStatus::Queued => vec![status],
_ => vec![],
})
.into_any_element() .into_any_element()
} }
} }
@ -573,13 +576,22 @@ impl LineHeight for ExecutionView {
return 1; // For the status message if outputs are not there return 1; // For the status message if outputs are not there
} }
self.outputs let num_lines = self
.outputs
.iter() .iter()
.map(|output| output.num_lines(cx)) .map(|output| output.num_lines(cx))
.fold(0_u8, |acc, additional_height| { .fold(0_u8, |acc, additional_height| {
acc.saturating_add(additional_height) acc.saturating_add(additional_height)
}) })
.max(1) .max(1);
let num_lines = match self.status {
// Account for the status message if the execution is still ongoing
ExecutionStatus::Executing => num_lines.saturating_add(1),
ExecutionStatus::Queued => num_lines.saturating_add(1),
_ => num_lines,
};
num_lines
} }
} }