use crate::branch_picker::{self, BranchList};use crate::git_panel::{GitPanel, commit_message_editor, panel_editor_style};use git::repository::CommitOptions;use git::{Amend, Commit, GenerateCommitMessage, Signoff};use panel::panel_button;use project::DisableAiSettings;use settings::Settings;use ui::{ ContextMenu, KeybindingHint, PopoverMenu, PopoverMenuHandle, SplitButton, Tooltip, prelude::*,}; use editor::{Editor, EditorElement};use gpui::*;use util::ResultExt;use workspace::{ ModalView, Workspace, dock::{Dock, PanelHandle},}; // nate: It is a pain to get editors to size correctly and not overflow.//// this can get replaced with a simple flex layout with more time/a more thoughtful approach.#[derive(Debug, Clone, Copy)]pub struct ModalContainerProperties { pub modal_width: f32, pub editor_height: f32, pub footer_height: f32, pub container_padding: f32, pub modal_border_radius: f32,} impl ModalContainerProperties { pub fn new(window: &Window, preferred_char_width: usize) -> Self { let container_padding = 5.0; // Calculate width based on character width let mut modal_width = 460.0; let style = window.text_style(); let font_id = window.text_system().resolve_font(&style.font()); let font_size = style.font_size.to_pixels(window.rem_size()); if let Ok(em_width) = window.text_system().em_width(font_id, font_size) { modal_width = f32::from(preferred_char_width as f32 * em_width + px(container_padding * 2.0)); } Self { modal_width, editor_height: 300.0, footer_height: 24.0, container_padding, modal_border_radius: 12.0, } } pub fn editor_border_radius(&self) -> Pixels { px(self.modal_border_radius - self.container_padding / 2.0) }} pub struct CommitModal { git_panel: Entity<GitPanel>, commit_editor: Entity<Editor>, restore_dock: RestoreDock, properties: ModalContainerProperties, branch_list_handle: PopoverMenuHandle<BranchList>, commit_menu_handle: PopoverMenuHandle<ContextMenu>,} impl Focusable for CommitModal { fn focus_handle(&self, cx: &App) -> gpui::FocusHandle { self.commit_editor.focus_handle(cx) }} impl EventEmitter<DismissEvent> for CommitModal {}impl ModalView for CommitModal { fn on_before_dismiss( &mut self, window: &mut Window, cx: &mut Context<Self>, ) -> workspace::DismissDecision { self.git_panel.update(cx, |git_panel, cx| { git_panel.set_modal_open(false, cx); }); self.restore_dock .dock .update(cx, |dock, cx| { if let Some(active_index) = self.restore_dock.active_index { dock.activate_panel(active_index, window, cx) } dock.set_open(self.restore_dock.is_open, window, cx) }) .log_err(); workspace::DismissDecision::Dismiss(true) }} struct RestoreDock { dock: WeakEntity<Dock>, is_open: bool, active_index: Option<usize>,} pub enum ForceMode { Amend, Commit,} impl CommitModal { pub fn register(workspace: &mut Workspace) { workspace.register_action(|workspace, _: &Commit, window, cx| { CommitModal::toggle(workspace, Some(ForceMode::Commit), window, cx); }); workspace.register_action(|workspace, _: &Amend, window, cx| { CommitModal::toggle(workspace, Some(ForceMode::Amend), window, cx); }); } pub fn toggle( workspace: &mut Workspace, force_mode: Option<ForceMode>, window: &mut Window, cx: &mut Context<Workspace>, ) { let Some(git_panel) = workspace.panel::<GitPanel>(cx) else { return; }; git_panel.update(cx, |git_panel, cx| { if let Some(force_mode) = force_mode { match force_mode { ForceMode::Amend => { if git_panel .active_repository .as_ref() .and_then(|repo| repo.read(cx).head_commit.as_ref()) .is_some() && !git_panel.amend_pending() { git_panel.set_amend_pending(true, cx); git_panel.load_last_commit_message(cx); } } ForceMode::Commit => { if git_panel.amend_pending() { git_panel.set_amend_pending(false, cx); } } } } git_panel.set_modal_open(true, cx); git_panel.load_local_committer(cx); }); let dock = workspace.dock_at_position(git_panel.position(window, cx)); let is_open = dock.read(cx).is_open(); let active_index = dock.read(cx).active_panel_index(); let dock = dock.downgrade(); let restore_dock_position = RestoreDock { dock, is_open, active_index, }; workspace.open_panel::<GitPanel>(window, cx); workspace.toggle_modal(window, cx, move |window, cx| { CommitModal::new(git_panel, restore_dock_position, window, cx) }) } fn new( git_panel: Entity<GitPanel>, restore_dock: RestoreDock, window: &mut Window, cx: &mut Context<Self>, ) -> Self { let panel = git_panel.read(cx); let suggested_commit_message = panel.suggest_commit_message(cx); let commit_editor = git_panel.update(cx, |git_panel, cx| { git_panel.set_modal_open(true, cx); let buffer = git_panel.commit_message_buffer(cx); let panel_editor = git_panel.commit_editor.clone(); let project = git_panel.project.clone(); cx.new(|cx| { let mut editor = commit_message_editor(buffer, None, project.clone(), false, window, cx); editor.sync_selections(panel_editor, cx).detach(); editor }) }); let commit_message = commit_editor.read(cx).text(cx); if let Some(suggested_commit_message) = suggested_commit_message && commit_message.is_empty() { commit_editor.update(cx, |editor, cx| { editor.set_placeholder_text(&suggested_commit_message, window, cx); }); } let focus_handle = commit_editor.focus_handle(cx); cx.on_focus_out(&focus_handle, window, |this, _, window, cx| { if !this.branch_list_handle.is_focused(window, cx) && !this.commit_menu_handle.is_focused(window, cx) { cx.emit(DismissEvent); } }) .detach(); let properties = ModalContainerProperties::new(window, 50); Self { git_panel, commit_editor, restore_dock, properties, branch_list_handle: PopoverMenuHandle::default(), commit_menu_handle: PopoverMenuHandle::default(), } } fn commit_editor_element(&self, window: &mut Window, cx: &mut Context<Self>) -> EditorElement { let editor_style = panel_editor_style(true, window, cx); EditorElement::new(&self.commit_editor, editor_style) } pub fn render_commit_editor( &self, window: &mut Window, cx: &mut Context<Self>, ) -> impl IntoElement { let properties = self.properties; let padding_t = 3.0; let padding_b = 6.0; // magic number for editor not to overflow the container?? let extra_space_hack = 1.5 * window.line_height(); v_flex() .h(px(properties.editor_height + padding_b + padding_t) + extra_space_hack) .w_full() .flex_none() .rounded(properties.editor_border_radius()) .overflow_hidden() .px_1p5() .pt(px(padding_t)) .pb(px(padding_b)) .child( div() .h(px(properties.editor_height)) .w_full() .child(self.commit_editor_element(window, cx)), ) } fn render_git_commit_menu( &self, id: impl Into<ElementId>, keybinding_target: Option<FocusHandle>, ) -> impl IntoElement { PopoverMenu::new(id.into()) .trigger( ui::ButtonLike::new_rounded_right("commit-split-button-right") .layer(ui::ElevationIndex::ModalSurface) .size(ui::ButtonSize::None) .child( div() .px_1() .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)), ), ) .menu({ let git_panel_entity = self.git_panel.clone(); move |window, cx| { let git_panel = git_panel_entity.read(cx); let amend_enabled = git_panel.amend_pending(); let signoff_enabled = git_panel.signoff_enabled(); let has_previous_commit = git_panel.head_commit(cx).is_some(); Some(ContextMenu::build(window, cx, |context_menu, _, _| { context_menu .when_some(keybinding_target.clone(), |el, keybinding_target| { el.context(keybinding_target) }) .when(has_previous_commit, |this| { this.toggleable_entry( "Amend", amend_enabled, IconPosition::Start, Some(Box::new(Amend)), { let git_panel = git_panel_entity.downgrade(); move |_, cx| { git_panel .update(cx, |git_panel, cx| { git_panel.toggle_amend_pending(cx); }) .ok(); } }, ) }) .toggleable_entry( "Signoff", signoff_enabled, IconPosition::Start, Some(Box::new(Signoff)), { let git_panel = git_panel_entity.clone(); move |window, cx| { git_panel.update(cx, |git_panel, cx| { git_panel.toggle_signoff_enabled(&Signoff, window, cx); }) } }, ) })) } }) .with_handle(self.commit_menu_handle.clone()) .anchor(Corner::TopRight) } pub fn render_footer(&self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement { let ( can_commit, tooltip, commit_label, co_authors, generate_commit_message, active_repo, is_amend_pending, is_signoff_enabled, workspace, ) = self.git_panel.update(cx, |git_panel, cx| { let (can_commit, tooltip) = git_panel.configure_commit_button(cx); let title = git_panel.commit_button_title(); let co_authors = git_panel.render_co_authors(cx); let generate_commit_message = git_panel.render_generate_commit_message_button(cx); let active_repo = git_panel.active_repository.clone(); let is_amend_pending = git_panel.amend_pending(); let is_signoff_enabled = git_panel.signoff_enabled(); ( can_commit, tooltip, title, co_authors, generate_commit_message, active_repo, is_amend_pending, is_signoff_enabled, git_panel.workspace.clone(), ) }); let branch = active_repo .as_ref() .and_then(|repo| repo.read(cx).branch.as_ref()) .map(|b| b.name().to_owned()) .unwrap_or_else(|| "<no branch>".to_owned()); let branch_picker_button = panel_button(branch) .start_icon( Icon::new(IconName::GitBranch) .size(IconSize::Small) .color(Color::Placeholder), ) .color(Color::Muted) .on_click(cx.listener(|_, _, window, cx| { window.dispatch_action(zed_actions::git::Branch.boxed_clone(), cx); })) .style(ButtonStyle::Transparent); let branch_picker = PopoverMenu::new("popover-button") .menu(move |window, cx| { Some(branch_picker::popover( workspace.clone(), false, active_repo.clone(), window, cx, )) }) .with_handle(self.branch_list_handle.clone()) .trigger_with_tooltip( branch_picker_button, Tooltip::for_action_title("Switch Branch", &zed_actions::git::Branch), ) .anchor(Corner::BottomLeft) .offset(gpui::Point { x: px(0.0), y: px(-2.0), }); let focus_handle = self.focus_handle(cx); let close_kb_hint = ui::KeyBinding::for_action(&menu::Cancel, cx).map(|close_kb| { KeybindingHint::new(close_kb, cx.theme().colors().editor_background).suffix("Cancel") }); h_flex() .group("commit_editor_footer") .flex_none() .w_full() .items_center() .justify_between() .w_full() .h(px(self.properties.footer_height)) .gap_1() .child( h_flex() .gap_1() .flex_shrink() .overflow_x_hidden() .child( h_flex() .flex_shrink() .overflow_x_hidden() .child(branch_picker), ) .children(generate_commit_message) .children(co_authors), ) .child(div().flex_1()) .child( h_flex() .items_center() .justify_end() .flex_none() .px_1() .gap_4() .child(close_kb_hint) .child(SplitButton::new( ui::ButtonLike::new_rounded_left(ElementId::Name( format!("split-button-left-{}", commit_label).into(), )) .layer(ui::ElevationIndex::ModalSurface) .size(ui::ButtonSize::Compact) .child( div() .child(Label::new(commit_label).size(LabelSize::Small)) .mr_0p5(), ) .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| { telemetry::event!("Git Committed", source = "Git Modal"); this.git_panel.update(cx, |git_panel, cx| { git_panel.commit_changes( CommitOptions { amend: is_amend_pending, signoff: is_signoff_enabled, }, window, cx, ) }); cx.emit(DismissEvent); })) .disabled(!can_commit) .tooltip({ let focus_handle = focus_handle.clone(); move |_window, cx| { if can_commit { Tooltip::with_meta_in( tooltip, Some(if is_amend_pending { &git::Amend } else { &git::Commit }), format!( "git commit{}{}", if is_amend_pending { " --amend" } else { "" }, if is_signoff_enabled { " --signoff" } else { "" } ), &focus_handle.clone(), cx, ) } else { Tooltip::simple(tooltip, cx) } } }), self.render_git_commit_menu( ElementId::Name(format!("split-button-right-{}", commit_label).into()), Some(focus_handle), ) .into_any_element(), )), ) } fn dismiss(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) { if self.git_panel.read(cx).amend_pending() { self.git_panel .update(cx, |git_panel, cx| git_panel.set_amend_pending(false, cx));Lines 1–500 of 604. Load more
use crate::branch_picker::{self, BranchList}; use crate::git_panel::{GitPanel, commit_message_editor, panel_editor_style}; use git::repository::CommitOptions; use git::{Amend, Commit, GenerateCommitMessage, Signoff}; use panel::panel_button; use project::DisableAiSettings; use settings::Settings; use ui::{ ContextMenu, KeybindingHint, PopoverMenu, PopoverMenuHandle, SplitButton, Tooltip, prelude::*, }; use editor::{Editor, EditorElement}; use gpui::*; use util::ResultExt; use workspace::{ ModalView, Workspace, dock::{Dock, PanelHandle}, }; // nate: It is a pain to get editors to size correctly and not overflow. // // this can get replaced with a simple flex layout with more time/a more thoughtful approach. #[derive(Debug, Clone, Copy)] pub struct ModalContainerProperties { pub modal_width: f32, pub editor_height: f32, pub footer_height: f32, pub container_padding: f32, pub modal_border_radius: f32, } impl ModalContainerProperties { pub fn new(window: &Window, preferred_char_width: usize) -> Self { let container_padding = 5.0; // Calculate width based on character width let mut modal_width = 460.0; let style = window.text_style(); let font_id = window.text_system().resolve_font(&style.font()); let font_size = style.font_size.to_pixels(window.rem_size()); if let Ok(em_width) = window.text_system().em_width(font_id, font_size) { modal_width = f32::from(preferred_char_width as f32 * em_width + px(container_padding * 2.0)); } Self { modal_width, editor_height: 300.0, footer_height: 24.0, container_padding, modal_border_radius: 12.0, } } pub fn editor_border_radius(&self) -> Pixels { px(self.modal_border_radius - self.container_padding / 2.0) } } pub struct CommitModal { git_panel: Entity<GitPanel>, commit_editor: Entity<Editor>, restore_dock: RestoreDock, properties: ModalContainerProperties, branch_list_handle: PopoverMenuHandle<BranchList>, commit_menu_handle: PopoverMenuHandle<ContextMenu>, } impl Focusable for CommitModal { fn focus_handle(&self, cx: &App) -> gpui::FocusHandle { self.commit_editor.focus_handle(cx) } } impl EventEmitter<DismissEvent> for CommitModal {} impl ModalView for CommitModal { fn on_before_dismiss( &mut self, window: &mut Window, cx: &mut Context<Self>, ) -> workspace::DismissDecision { self.git_panel.update(cx, |git_panel, cx| { git_panel.set_modal_open(false, cx); }); self.restore_dock .dock .update(cx, |dock, cx| { if let Some(active_index) = self.restore_dock.active_index { dock.activate_panel(active_index, window, cx) } dock.set_open(self.restore_dock.is_open, window, cx) }) .log_err(); workspace::DismissDecision::Dismiss(true) } } struct RestoreDock { dock: WeakEntity<Dock>, is_open: bool, active_index: Option<usize>, } pub enum ForceMode { Amend, Commit, } impl CommitModal { pub fn register(workspace: &mut Workspace) { workspace.register_action(|workspace, _: &Commit, window, cx| { CommitModal::toggle(workspace, Some(ForceMode::Commit), window, cx); }); workspace.register_action(|workspace, _: &Amend, window, cx| { CommitModal::toggle(workspace, Some(ForceMode::Amend), window, cx); }); } pub fn toggle( workspace: &mut Workspace, force_mode: Option<ForceMode>, window: &mut Window, cx: &mut Context<Workspace>, ) { let Some(git_panel) = workspace.panel::<GitPanel>(cx) else { return; }; git_panel.update(cx, |git_panel, cx| { if let Some(force_mode) = force_mode { match force_mode { ForceMode::Amend => { if git_panel .active_repository .as_ref() .and_then(|repo| repo.read(cx).head_commit.as_ref()) .is_some() && !git_panel.amend_pending() { git_panel.set_amend_pending(true, cx); git_panel.load_last_commit_message(cx); } } ForceMode::Commit => { if git_panel.amend_pending() { git_panel.set_amend_pending(false, cx); } } } } git_panel.set_modal_open(true, cx); git_panel.load_local_committer(cx); }); let dock = workspace.dock_at_position(git_panel.position(window, cx)); let is_open = dock.read(cx).is_open(); let active_index = dock.read(cx).active_panel_index(); let dock = dock.downgrade(); let restore_dock_position = RestoreDock { dock, is_open, active_index, }; workspace.open_panel::<GitPanel>(window, cx); workspace.toggle_modal(window, cx, move |window, cx| { CommitModal::new(git_panel, restore_dock_position, window, cx) }) } fn new( git_panel: Entity<GitPanel>, restore_dock: RestoreDock, window: &mut Window, cx: &mut Context<Self>, ) -> Self { let panel = git_panel.read(cx); let suggested_commit_message = panel.suggest_commit_message(cx); let commit_editor = git_panel.update(cx, |git_panel, cx| { git_panel.set_modal_open(true, cx); let buffer = git_panel.commit_message_buffer(cx); let panel_editor = git_panel.commit_editor.clone(); let project = git_panel.project.clone(); cx.new(|cx| { let mut editor = commit_message_editor(buffer, None, project.clone(), false, window, cx); editor.sync_selections(panel_editor, cx).detach(); editor }) }); let commit_message = commit_editor.read(cx).text(cx); if let Some(suggested_commit_message) = suggested_commit_message && commit_message.is_empty() { commit_editor.update(cx, |editor, cx| { editor.set_placeholder_text(&suggested_commit_message, window, cx); }); } let focus_handle = commit_editor.focus_handle(cx); cx.on_focus_out(&focus_handle, window, |this, _, window, cx| { if !this.branch_list_handle.is_focused(window, cx) && !this.commit_menu_handle.is_focused(window, cx) { cx.emit(DismissEvent); } }) .detach(); let properties = ModalContainerProperties::new(window, 50); Self { git_panel, commit_editor, restore_dock, properties, branch_list_handle: PopoverMenuHandle::default(), commit_menu_handle: PopoverMenuHandle::default(), } } fn commit_editor_element(&self, window: &mut Window, cx: &mut Context<Self>) -> EditorElement { let editor_style = panel_editor_style(true, window, cx); EditorElement::new(&self.commit_editor, editor_style) } pub fn render_commit_editor( &self, window: &mut Window, cx: &mut Context<Self>, ) -> impl IntoElement { let properties = self.properties; let padding_t = 3.0; let padding_b = 6.0; // magic number for editor not to overflow the container?? let extra_space_hack = 1.5 * window.line_height(); v_flex() .h(px(properties.editor_height + padding_b + padding_t) + extra_space_hack) .w_full() .flex_none() .rounded(properties.editor_border_radius()) .overflow_hidden() .px_1p5() .pt(px(padding_t)) .pb(px(padding_b)) .child( div() .h(px(properties.editor_height)) .w_full() .child(self.commit_editor_element(window, cx)), ) } fn render_git_commit_menu( &self, id: impl Into<ElementId>, keybinding_target: Option<FocusHandle>, ) -> impl IntoElement { PopoverMenu::new(id.into()) .trigger( ui::ButtonLike::new_rounded_right("commit-split-button-right") .layer(ui::ElevationIndex::ModalSurface) .size(ui::ButtonSize::None) .child( div() .px_1() .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)), ), ) .menu({ let git_panel_entity = self.git_panel.clone(); move |window, cx| { let git_panel = git_panel_entity.read(cx); let amend_enabled = git_panel.amend_pending(); let signoff_enabled = git_panel.signoff_enabled(); let has_previous_commit = git_panel.head_commit(cx).is_some(); Some(ContextMenu::build(window, cx, |context_menu, _, _| { context_menu .when_some(keybinding_target.clone(), |el, keybinding_target| { el.context(keybinding_target) }) .when(has_previous_commit, |this| { this.toggleable_entry( "Amend", amend_enabled, IconPosition::Start, Some(Box::new(Amend)), { let git_panel = git_panel_entity.downgrade(); move |_, cx| { git_panel .update(cx, |git_panel, cx| { git_panel.toggle_amend_pending(cx); }) .ok(); } }, ) }) .toggleable_entry( "Signoff", signoff_enabled, IconPosition::Start, Some(Box::new(Signoff)), { let git_panel = git_panel_entity.clone(); move |window, cx| { git_panel.update(cx, |git_panel, cx| { git_panel.toggle_signoff_enabled(&Signoff, window, cx); }) } }, ) })) } }) .with_handle(self.commit_menu_handle.clone()) .anchor(Corner::TopRight) } pub fn render_footer(&self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement { let ( can_commit, tooltip, commit_label, co_authors, generate_commit_message, active_repo, is_amend_pending, is_signoff_enabled, workspace, ) = self.git_panel.update(cx, |git_panel, cx| { let (can_commit, tooltip) = git_panel.configure_commit_button(cx); let title = git_panel.commit_button_title(); let co_authors = git_panel.render_co_authors(cx); let generate_commit_message = git_panel.render_generate_commit_message_button(cx); let active_repo = git_panel.active_repository.clone(); let is_amend_pending = git_panel.amend_pending(); let is_signoff_enabled = git_panel.signoff_enabled(); ( can_commit, tooltip, title, co_authors, generate_commit_message, active_repo, is_amend_pending, is_signoff_enabled, git_panel.workspace.clone(), ) }); let branch = active_repo .as_ref() .and_then(|repo| repo.read(cx).branch.as_ref()) .map(|b| b.name().to_owned()) .unwrap_or_else(|| "<no branch>".to_owned()); let branch_picker_button = panel_button(branch) .start_icon( Icon::new(IconName::GitBranch) .size(IconSize::Small) .color(Color::Placeholder), ) .color(Color::Muted) .on_click(cx.listener(|_, _, window, cx| { window.dispatch_action(zed_actions::git::Branch.boxed_clone(), cx); })) .style(ButtonStyle::Transparent); let branch_picker = PopoverMenu::new("popover-button") .menu(move |window, cx| { Some(branch_picker::popover( workspace.clone(), false, active_repo.clone(), window, cx, )) }) .with_handle(self.branch_list_handle.clone()) .trigger_with_tooltip( branch_picker_button, Tooltip::for_action_title("Switch Branch", &zed_actions::git::Branch), ) .anchor(Corner::BottomLeft) .offset(gpui::Point { x: px(0.0), y: px(-2.0), }); let focus_handle = self.focus_handle(cx); let close_kb_hint = ui::KeyBinding::for_action(&menu::Cancel, cx).map(|close_kb| { KeybindingHint::new(close_kb, cx.theme().colors().editor_background).suffix("Cancel") }); h_flex() .group("commit_editor_footer") .flex_none() .w_full() .items_center() .justify_between() .w_full() .h(px(self.properties.footer_height)) .gap_1() .child( h_flex() .gap_1() .flex_shrink() .overflow_x_hidden() .child( h_flex() .flex_shrink() .overflow_x_hidden() .child(branch_picker), ) .children(generate_commit_message) .children(co_authors), ) .child(div().flex_1()) .child( h_flex() .items_center() .justify_end() .flex_none() .px_1() .gap_4() .child(close_kb_hint) .child(SplitButton::new( ui::ButtonLike::new_rounded_left(ElementId::Name( format!("split-button-left-{}", commit_label).into(), )) .layer(ui::ElevationIndex::ModalSurface) .size(ui::ButtonSize::Compact) .child( div() .child(Label::new(commit_label).size(LabelSize::Small)) .mr_0p5(), ) .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| { telemetry::event!("Git Committed", source = "Git Modal"); this.git_panel.update(cx, |git_panel, cx| { git_panel.commit_changes( CommitOptions { amend: is_amend_pending, signoff: is_signoff_enabled, }, window, cx, ) }); cx.emit(DismissEvent); })) .disabled(!can_commit) .tooltip({ let focus_handle = focus_handle.clone(); move |_window, cx| { if can_commit { Tooltip::with_meta_in( tooltip, Some(if is_amend_pending { &git::Amend } else { &git::Commit }), format!( "git commit{}{}", if is_amend_pending { " --amend" } else { "" }, if is_signoff_enabled { " --signoff" } else { "" } ), &focus_handle.clone(), cx, ) } else { Tooltip::simple(tooltip, cx) } } }), self.render_git_commit_menu( ElementId::Name(format!("split-button-right-{}", commit_label).into()), Some(focus_handle), ) .into_any_element(), )), ) } fn dismiss(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) { if self.git_panel.read(cx).amend_pending() { self.git_panel .update(cx, |git_panel, cx| git_panel.set_amend_pending(false, cx));