Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
repl: Add notebook cell stop button (#57093)
Nadira9e469198a60
diff --git a/crates/repl/src/notebook/cell.rs b/crates/repl/src/notebook/cell.rsindex 2267c135c17..2baf05a2d5a 100644--- a/crates/repl/src/notebook/cell.rs+++ b/crates/repl/src/notebook/cell.rs@@ -14,6 +14,7 @@ use runtimelib::{JupyterMessage, JupyterMessageContent};use settings::Settings as _;use ui::{CommonAnimationExt, IconButtonShape, prelude::*};use util::ResultExt;+use zed_actions::notebook::InterruptKernel;use crate::{notebook::{CODE_BLOCK_INSET, GUTTER_WIDTH},@@ -31,6 +32,7 @@ pub enum CellPosition {pub enum CellControlType {RunCell,RerunCell,+ StopCell,ClearCell,CellOptions,CollapseCell,@@ -52,12 +54,24 @@ impl CellControlType {match self {CellControlType::RunCell => IconName::PlayFilled,CellControlType::RerunCell => IconName::ArrowCircle,+ CellControlType::StopCell => IconName::Stop,CellControlType::ClearCell => IconName::ListX,CellControlType::CellOptions => IconName::Ellipsis,CellControlType::CollapseCell => IconName::ChevronDown,CellControlType::ExpandCell => IconName::ChevronRight,}}+ fn id(&self) -> &'static str {+ match self {+ CellControlType::RunCell => "CellControlType::RunCell",+ CellControlType::RerunCell => "CellControlType::RerunCell",+ CellControlType::StopCell => "CellControlType::StopCell",+ CellControlType::ClearCell => "CellControlType::ClearCell",+ CellControlType::CellOptions => "CellControlType::CellOptions",+ CellControlType::CollapseCell => "CellControlType::CollapseCelln",+ CellControlType::ExpandCell => "CellControlType::ExpandCell",+ }+ }}pub struct CellControl {@@ -927,23 +941,25 @@ impl RenderableCell for CodeCell {}fn control(&self, _window: &mut Window, cx: &mut Context<Self>) -> Option<CellControl> {- let control_type = if self.has_outputs() {+ let control_type = if self.is_executing {+ CellControlType::StopCell+ } else if self.has_outputs() {CellControlType::RerunCell} else {CellControlType::RunCell};- let cell_control = CellControl::new(- if self.has_outputs() {- "rerun-cell"- } else {- "run-cell"- },- control_type,+ Some(+ CellControl::new(control_type.id(), control_type).on_click(cx.listener(+ move |this, _, window, cx| {+ if this.is_executing {+ window.dispatch_action(Box::new(InterruptKernel), cx);+ } else {+ this.run(window, cx);+ }+ },+ )),)- .on_click(cx.listener(move |this, _, window, cx| this.run(window, cx)));-- Some(cell_control)}fn selected(&self) -> bool {