use std::any::{Any, TypeId}; use ::git::UnstageAndNext; use anyhow::Result; use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus}; use collections::HashSet; use editor::{ actions::{GoToHunk, GoToPrevHunk}, scroll::Autoscroll, Editor, EditorEvent, ToPoint, }; use feature_flags::FeatureFlagViewExt; use futures::StreamExt; use git::{Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll}; use gpui::{ actions, Action, AnyElement, AnyView, App, AppContext as _, AsyncWindowContext, Entity, EventEmitter, FocusHandle, Focusable, Render, Subscription, Task, WeakEntity, }; use language::{Anchor, Buffer, Capability, OffsetRangeExt, Point}; use multi_buffer::{MultiBuffer, PathKey}; use project::{git::GitStore, Project, ProjectPath}; use theme::ActiveTheme; use ui::{prelude::*, vertical_divider, Tooltip}; use util::ResultExt as _; use workspace::{ item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams}, searchable::SearchableItemHandle, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace, }; use crate::git_panel::{GitPanel, GitPanelAddon, GitStatusEntry}; actions!(git, [Diff]); pub(crate) struct ProjectDiff { multibuffer: Entity, editor: Entity, project: Entity, git_store: Entity, workspace: WeakEntity, focus_handle: FocusHandle, update_needed: postage::watch::Sender<()>, pending_scroll: Option, _task: Task>, _subscription: Subscription, } struct DiffBuffer { path_key: PathKey, buffer: Entity, diff: Entity, } const CONFLICT_NAMESPACE: &'static str = "0"; const TRACKED_NAMESPACE: &'static str = "1"; const NEW_NAMESPACE: &'static str = "2"; impl ProjectDiff { pub(crate) fn register( _: &mut Workspace, window: Option<&mut Window>, cx: &mut Context, ) { let Some(window) = window else { return }; cx.when_flag_enabled::(window, |workspace, _, _cx| { workspace.register_action(Self::deploy); }); workspace::register_serializable_item::(cx); } fn deploy( workspace: &mut Workspace, _: &Diff, window: &mut Window, cx: &mut Context, ) { workspace.open_panel::(window, cx); Self::deploy_at(workspace, None, window, cx) } pub fn deploy_at( workspace: &mut Workspace, entry: Option, window: &mut Window, cx: &mut Context, ) { let project_diff = if let Some(existing) = workspace.item_of_type::(cx) { workspace.activate_item(&existing, true, true, window, cx); existing } else { let workspace_handle = cx.entity(); let project_diff = cx.new(|cx| Self::new(workspace.project().clone(), workspace_handle, window, cx)); workspace.add_item_to_active_pane( Box::new(project_diff.clone()), None, true, window, cx, ); project_diff }; if let Some(entry) = entry { project_diff.update(cx, |project_diff, cx| { project_diff.scroll_to(entry, window, cx); }) } } fn new( project: Entity, workspace: Entity, window: &mut Window, cx: &mut Context, ) -> Self { let focus_handle = cx.focus_handle(); let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite)); let editor = cx.new(|cx| { let mut diff_display_editor = Editor::for_multibuffer( multibuffer.clone(), Some(project.clone()), true, window, cx, ); diff_display_editor.set_distinguish_unstaged_diff_hunks(); diff_display_editor.set_expand_all_diff_hunks(cx); diff_display_editor.register_addon(GitPanelAddon { workspace: workspace.downgrade(), }); diff_display_editor }); cx.subscribe_in(&editor, window, Self::handle_editor_event) .detach(); let git_store = project.read(cx).git_store().clone(); let git_store_subscription = cx.subscribe_in( &git_store, window, move |this, _git_store, _event, _window, _cx| { *this.update_needed.borrow_mut() = (); }, ); let (mut send, recv) = postage::watch::channel::<()>(); let worker = window.spawn(cx, { let this = cx.weak_entity(); |cx| Self::handle_status_updates(this, recv, cx) }); // Kick of a refresh immediately *send.borrow_mut() = (); Self { project, git_store: git_store.clone(), workspace: workspace.downgrade(), focus_handle, editor, multibuffer, pending_scroll: None, update_needed: send, _task: worker, _subscription: git_store_subscription, } } pub fn scroll_to( &mut self, entry: GitStatusEntry, window: &mut Window, cx: &mut Context, ) { let Some(git_repo) = self.git_store.read(cx).active_repository() else { return; }; let repo = git_repo.read(cx); let namespace = if repo.has_conflict(&entry.repo_path) { CONFLICT_NAMESPACE } else if entry.status.is_created() { NEW_NAMESPACE } else { TRACKED_NAMESPACE }; let path_key = PathKey::namespaced(namespace, entry.repo_path.0.clone()); self.scroll_to_path(path_key, window, cx) } fn scroll_to_path(&mut self, path_key: PathKey, window: &mut Window, cx: &mut Context) { if let Some(position) = self.multibuffer.read(cx).location_for_path(&path_key, cx) { self.editor.update(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::focused()), window, cx, |s| { s.select_ranges([position..position]); }) }) } else { self.pending_scroll = Some(path_key); } } fn button_states(&self, cx: &App) -> ButtonStates { let editor = self.editor.read(cx); let snapshot = self.multibuffer.read(cx).snapshot(cx); let prev_next = snapshot.diff_hunks().skip(1).next().is_some(); let mut selection = true; let mut ranges = editor .selections .disjoint_anchor_ranges() .collect::>(); if !ranges.iter().any(|range| range.start != range.end) { selection = false; if let Some((excerpt_id, buffer, range)) = self.editor.read(cx).active_excerpt(cx) { ranges = vec![multi_buffer::Anchor::range_in_buffer( excerpt_id, buffer.read(cx).remote_id(), range, )]; } else { ranges = Vec::default(); } } let mut has_staged_hunks = false; let mut has_unstaged_hunks = false; for hunk in editor.diff_hunks_in_ranges(&ranges, &snapshot) { match hunk.secondary_status { DiffHunkSecondaryStatus::HasSecondaryHunk => { has_unstaged_hunks = true; } DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk => { has_staged_hunks = true; has_unstaged_hunks = true; } DiffHunkSecondaryStatus::None => { has_staged_hunks = true; } } } let mut commit = false; let mut stage_all = false; let mut unstage_all = false; self.workspace .read_with(cx, |workspace, cx| { if let Some(git_panel) = workspace.panel::(cx) { let git_panel = git_panel.read(cx); commit = git_panel.can_commit(); stage_all = git_panel.can_stage_all(); unstage_all = git_panel.can_unstage_all(); } }) .ok(); return ButtonStates { stage: has_unstaged_hunks, unstage: has_staged_hunks, prev_next, selection, commit, stage_all, unstage_all, }; } fn handle_editor_event( &mut self, editor: &Entity, event: &EditorEvent, window: &mut Window, cx: &mut Context, ) { match event { EditorEvent::ScrollPositionChanged { .. } => editor.update(cx, |editor, cx| { let anchor = editor.scroll_manager.anchor().anchor; let multibuffer = self.multibuffer.read(cx); let snapshot = multibuffer.snapshot(cx); let mut point = anchor.to_point(&snapshot); point.row = (point.row + 1).min(snapshot.max_row().0); let Some((_, buffer, _)) = self.multibuffer.read(cx).excerpt_containing(point, cx) else { return; }; let Some(project_path) = buffer .read(cx) .file() .map(|file| (file.worktree_id(cx), file.path().clone())) else { return; }; self.workspace .update(cx, |workspace, cx| { if let Some(git_panel) = workspace.panel::(cx) { git_panel.update(cx, |git_panel, cx| { git_panel.select_entry_by_path(project_path.into(), window, cx) }) } }) .ok(); }), _ => {} } } fn load_buffers(&mut self, cx: &mut Context) -> Vec>> { let Some(repo) = self.git_store.read(cx).active_repository() else { self.multibuffer.update(cx, |multibuffer, cx| { multibuffer.clear(cx); }); return vec![]; }; let mut previous_paths = self.multibuffer.read(cx).paths().collect::>(); let mut result = vec![]; repo.update(cx, |repo, cx| { for entry in repo.status() { if !entry.status.has_changes() { continue; } let Some(project_path) = repo.repo_path_to_project_path(&entry.repo_path) else { continue; }; let namespace = if repo.has_conflict(&entry.repo_path) { CONFLICT_NAMESPACE } else if entry.status.is_created() { NEW_NAMESPACE } else { TRACKED_NAMESPACE }; let path_key = PathKey::namespaced(namespace, entry.repo_path.0.clone()); previous_paths.remove(&path_key); let load_buffer = self .project .update(cx, |project, cx| project.open_buffer(project_path, cx)); let project = self.project.clone(); result.push(cx.spawn(|_, mut cx| async move { let buffer = load_buffer.await?; let changes = project .update(&mut cx, |project, cx| { project.open_uncommitted_diff(buffer.clone(), cx) })? .await?; Ok(DiffBuffer { path_key, buffer, diff: changes, }) })); } }); self.multibuffer.update(cx, |multibuffer, cx| { for path in previous_paths { multibuffer.remove_excerpts_for_path(path, cx); } }); result } fn register_buffer( &mut self, diff_buffer: DiffBuffer, window: &mut Window, cx: &mut Context, ) { let path_key = diff_buffer.path_key; let buffer = diff_buffer.buffer; let diff = diff_buffer.diff; let snapshot = buffer.read(cx).snapshot(); let diff = diff.read(cx); let diff_hunk_ranges = if diff.base_text().is_none() { vec![Point::zero()..snapshot.max_point()] } else { diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx) .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot)) .collect::>() }; self.multibuffer.update(cx, |multibuffer, cx| { multibuffer.set_excerpts_for_path( path_key.clone(), buffer, diff_hunk_ranges, editor::DEFAULT_MULTIBUFFER_CONTEXT, cx, ); }); if self.multibuffer.read(cx).is_empty() && self .editor .read(cx) .focus_handle(cx) .contains_focused(window, cx) { self.focus_handle.focus(window); } else if self.focus_handle.is_focused(window) && !self.multibuffer.read(cx).is_empty() { self.editor.update(cx, |editor, cx| { editor.focus_handle(cx).focus(window); }); } if self.pending_scroll.as_ref() == Some(&path_key) { self.scroll_to_path(path_key, window, cx); } } pub async fn handle_status_updates( this: WeakEntity, mut recv: postage::watch::Receiver<()>, mut cx: AsyncWindowContext, ) -> Result<()> { while let Some(_) = recv.next().await { let buffers_to_load = this.update(&mut cx, |this, cx| this.load_buffers(cx))?; for buffer_to_load in buffers_to_load { if let Some(buffer) = buffer_to_load.await.log_err() { cx.update(|window, cx| { this.update(cx, |this, cx| this.register_buffer(buffer, window, cx)) .ok(); })?; } } this.update(&mut cx, |this, _| this.pending_scroll.take())?; } Ok(()) } } impl EventEmitter for ProjectDiff {} impl Focusable for ProjectDiff { fn focus_handle(&self, cx: &App) -> FocusHandle { if self.multibuffer.read(cx).is_empty() { self.focus_handle.clone() } else { self.editor.focus_handle(cx) } } } impl Item for ProjectDiff { type Event = EditorEvent; fn tab_icon(&self, _window: &Window, _cx: &App) -> Option { Some(Icon::new(IconName::GitBranch).color(Color::Muted)) } fn to_item_events(event: &EditorEvent, f: impl FnMut(ItemEvent)) { Editor::to_item_events(event, f) } fn deactivated(&mut self, window: &mut Window, cx: &mut Context) { self.editor .update(cx, |editor, cx| editor.deactivated(window, cx)); } fn navigate( &mut self, data: Box, window: &mut Window, cx: &mut Context, ) -> bool { self.editor .update(cx, |editor, cx| editor.navigate(data, window, cx)) } fn tab_tooltip_text(&self, _: &App) -> Option { Some("Project Diff".into()) } fn tab_content(&self, params: TabContentParams, _window: &Window, _: &App) -> AnyElement { Label::new("Uncommitted Changes") .color(if params.selected { Color::Default } else { Color::Muted }) .into_any_element() } fn telemetry_event_text(&self) -> Option<&'static str> { Some("Project Diff Opened") } fn as_searchable(&self, _: &Entity) -> Option> { Some(Box::new(self.editor.clone())) } fn for_each_project_item( &self, cx: &App, f: &mut dyn FnMut(gpui::EntityId, &dyn project::ProjectItem), ) { self.editor.for_each_project_item(cx, f) } fn is_singleton(&self, _: &App) -> bool { false } fn set_nav_history( &mut self, nav_history: ItemNavHistory, _: &mut Window, cx: &mut Context, ) { self.editor.update(cx, |editor, _| { editor.set_nav_history(Some(nav_history)); }); } fn clone_on_split( &self, _workspace_id: Option, window: &mut Window, cx: &mut Context, ) -> Option> where Self: Sized, { let workspace = self.workspace.upgrade()?; Some(cx.new(|cx| ProjectDiff::new(self.project.clone(), workspace, window, cx))) } fn is_dirty(&self, cx: &App) -> bool { self.multibuffer.read(cx).is_dirty(cx) } fn has_conflict(&self, cx: &App) -> bool { self.multibuffer.read(cx).has_conflict(cx) } fn can_save(&self, _: &App) -> bool { true } fn save( &mut self, format: bool, project: Entity, window: &mut Window, cx: &mut Context, ) -> Task> { self.editor.save(format, project, window, cx) } fn save_as( &mut self, _: Entity, _: ProjectPath, _window: &mut Window, _: &mut Context, ) -> Task> { unreachable!() } fn reload( &mut self, project: Entity, window: &mut Window, cx: &mut Context, ) -> Task> { self.editor.reload(project, window, cx) } fn act_as_type<'a>( &'a self, type_id: TypeId, self_handle: &'a Entity, _: &'a App, ) -> Option { if type_id == TypeId::of::() { Some(self_handle.to_any()) } else if type_id == TypeId::of::() { Some(self.editor.to_any()) } else { None } } fn breadcrumb_location(&self, _: &App) -> ToolbarItemLocation { ToolbarItemLocation::PrimaryLeft } fn breadcrumbs(&self, theme: &theme::Theme, cx: &App) -> Option> { self.editor.breadcrumbs(theme, cx) } fn added_to_workspace( &mut self, workspace: &mut Workspace, window: &mut Window, cx: &mut Context, ) { self.editor.update(cx, |editor, cx| { editor.added_to_workspace(workspace, window, cx) }); } } impl Render for ProjectDiff { fn render(&mut self, _: &mut Window, cx: &mut Context) -> impl IntoElement { let is_empty = self.multibuffer.read(cx).is_empty(); div() .track_focus(&self.focus_handle) .bg(cx.theme().colors().editor_background) .flex() .items_center() .justify_center() .size_full() .when(is_empty, |el| { el.child(Label::new("No uncommitted changes")) }) .when(!is_empty, |el| el.child(self.editor.clone())) } } impl SerializableItem for ProjectDiff { fn serialized_item_kind() -> &'static str { "ProjectDiff" } fn cleanup( _: workspace::WorkspaceId, _: Vec, _: &mut Window, _: &mut App, ) -> Task> { Task::ready(Ok(())) } fn deserialize( _project: Entity, workspace: WeakEntity, _workspace_id: workspace::WorkspaceId, _item_id: workspace::ItemId, window: &mut Window, cx: &mut App, ) -> Task>> { window.spawn(cx, |mut cx| async move { workspace.update_in(&mut cx, |workspace, window, cx| { let workspace_handle = cx.entity(); cx.new(|cx| Self::new(workspace.project().clone(), workspace_handle, window, cx)) }) }) } fn serialize( &mut self, _workspace: &mut Workspace, _item_id: workspace::ItemId, _closing: bool, _window: &mut Window, _cx: &mut Context, ) -> Option>> { None } fn should_serialize(&self, _: &Self::Event) -> bool { false } } pub struct ProjectDiffToolbar { project_diff: Option>, workspace: WeakEntity, } impl ProjectDiffToolbar { pub fn new(workspace: &Workspace, _: &mut Context) -> Self { Self { project_diff: None, workspace: workspace.weak_handle(), } } fn project_diff(&self, _: &App) -> Option> { self.project_diff.as_ref()?.upgrade() } fn dispatch_action(&self, action: &dyn Action, window: &mut Window, cx: &mut Context) { if let Some(project_diff) = self.project_diff(cx) { project_diff.focus_handle(cx).focus(window); } let action = action.boxed_clone(); cx.defer(move |cx| { cx.dispatch_action(action.as_ref()); }) } fn dispatch_panel_action( &self, action: &dyn Action, window: &mut Window, cx: &mut Context, ) { self.workspace .read_with(cx, |workspace, cx| { if let Some(panel) = workspace.panel::(cx) { panel.focus_handle(cx).focus(window) } }) .ok(); let action = action.boxed_clone(); cx.defer(move |cx| { cx.dispatch_action(action.as_ref()); }) } } impl EventEmitter for ProjectDiffToolbar {} impl ToolbarItemView for ProjectDiffToolbar { fn set_active_pane_item( &mut self, active_pane_item: Option<&dyn ItemHandle>, _: &mut Window, cx: &mut Context, ) -> ToolbarItemLocation { self.project_diff = active_pane_item .and_then(|item| item.act_as::(cx)) .map(|entity| entity.downgrade()); if self.project_diff.is_some() { ToolbarItemLocation::PrimaryRight } else { ToolbarItemLocation::Hidden } } fn pane_focus_update( &mut self, _pane_focused: bool, _window: &mut Window, _cx: &mut Context, ) { } } struct ButtonStates { stage: bool, unstage: bool, prev_next: bool, selection: bool, stage_all: bool, unstage_all: bool, commit: bool, } impl Render for ProjectDiffToolbar { fn render(&mut self, _: &mut Window, cx: &mut Context) -> impl IntoElement { let Some(project_diff) = self.project_diff(cx) else { return div(); }; let focus_handle = project_diff.focus_handle(cx); let button_states = project_diff.read(cx).button_states(cx); h_group_xl() .my_neg_1() .items_center() .py_1() .pl_2() .pr_1() .flex_wrap() .justify_between() .child( h_group_sm() .when(button_states.selection, |el| { el.child( Button::new("stage", "Toggle Staged") .tooltip(Tooltip::for_action_title_in( "Toggle Staged", &ToggleStaged, &focus_handle, )) .disabled(!button_states.stage && !button_states.unstage) .on_click(cx.listener(|this, _, window, cx| { this.dispatch_action(&ToggleStaged, window, cx) })), ) }) .when(!button_states.selection, |el| { el.child( Button::new("stage", "Stage") .tooltip(Tooltip::for_action_title_in( "Stage", &StageAndNext, &focus_handle, )) // don't actually disable the button so it's mashable .color(if button_states.stage { Color::Default } else { Color::Disabled }) .on_click(cx.listener(|this, _, window, cx| { this.dispatch_action(&StageAndNext, window, cx) })), ) .child( Button::new("unstage", "Unstage") .tooltip(Tooltip::for_action_title_in( "Unstage", &UnstageAndNext, &focus_handle, )) .color(if button_states.unstage { Color::Default } else { Color::Disabled }) .on_click(cx.listener(|this, _, window, cx| { this.dispatch_action(&UnstageAndNext, window, cx) })), ) }), ) // n.b. the only reason these arrows are here is because we don't // support "undo" for staging so we need a way to go back. .child( h_group_sm() .child( IconButton::new("up", IconName::ArrowUp) .shape(ui::IconButtonShape::Square) .tooltip(Tooltip::for_action_title_in( "Go to previous hunk", &GoToPrevHunk, &focus_handle, )) .disabled(!button_states.prev_next) .on_click(cx.listener(|this, _, window, cx| { this.dispatch_action(&GoToPrevHunk, window, cx) })), ) .child( IconButton::new("down", IconName::ArrowDown) .shape(ui::IconButtonShape::Square) .tooltip(Tooltip::for_action_title_in( "Go to next hunk", &GoToHunk, &focus_handle, )) .disabled(!button_states.prev_next) .on_click(cx.listener(|this, _, window, cx| { this.dispatch_action(&GoToHunk, window, cx) })), ), ) .child(vertical_divider()) .child( h_group_sm() .when( button_states.unstage_all && !button_states.stage_all, |el| { el.child(Button::new("unstage-all", "Unstage All").on_click( cx.listener(|this, _, window, cx| { this.dispatch_panel_action(&UnstageAll, window, cx) }), )) }, ) .when( !button_states.unstage_all || button_states.stage_all, |el| { el.child( // todo make it so that changing to say "Unstaged" // doesn't change the position. div().child( Button::new("stage-all", "Stage All") .disabled(!button_states.stage_all) .on_click(cx.listener(|this, _, window, cx| { this.dispatch_panel_action(&StageAll, window, cx) })), ), ) }, ) .child( Button::new("commit", "Commit") .disabled(!button_states.commit) .on_click(cx.listener(|this, _, window, cx| { // todo this should open modal, not focus panel. this.dispatch_action(&Commit, window, cx); })), ), ) } }