Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git_ui: Fix `git::FileHistory` action in diff views (#63539)

Albert Bogusze621c4f441b0
diff --git a/crates/git_ui/src/git_graph.rs b/crates/git_ui/src/git_graph.rs
index 769752968b1..97b10ea3aa6 100644
--- a/crates/git_ui/src/git_graph.rs
+++ b/crates/git_ui/src/git_graph.rs
@@ -5849,6 +5849,67 @@ mod tests {
});
}
+ #[gpui::test]
+ async fn test_file_history_action_resolves_through_project_diff(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let fs = FakeFs::new(cx.executor());
+ fs.insert_tree(
+ Path::new(util::path!("/project")),
+ json!({
+ ".git": {},
+ "file.txt": "content",
+ }),
+ )
+ .await;
+ fs.set_head_and_index_for_repo(
+ Path::new(util::path!("/project/.git")),
+ &[("file.txt", "tracked".to_owned())],
+ );
+
+ let project = Project::test(fs.clone(), [Path::new(util::path!("/project"))], cx).await;
+ cx.run_until_parked();
+
+ let tracked_repo_path = RepoPath::new(&"file.txt").unwrap();
+
+ let (multi_workspace, cx) = cx.add_window_view(|window, cx| {
+ workspace::MultiWorkspace::test_new(project.clone(), window, cx)
+ });
+ let workspace = multi_workspace.read_with(cx, |multi, _| multi.workspace().clone());
+
+ // A project diff is a `ProjectDiff` item wrapping a `SplittableEditor`, not
+ // an `Editor` itself, so resolving the file-history target must go through
+ // `act_as` rather than a direct downcast of the active item.
+ cx.update(|window, cx| {
+ window.dispatch_action(Box::new(crate::project_diff::Diff), cx);
+ });
+ cx.run_until_parked();
+
+ workspace.read_with(cx, |workspace, cx| {
+ workspace
+ .active_item_as::<crate::ProjectDiff>(cx)
+ .expect("project diff should be the active item");
+ });
+
+ cx.update(|window, cx| {
+ window.dispatch_action(Box::new(git::FileHistory), cx);
+ });
+ cx.run_until_parked();
+
+ workspace.read_with(cx, |workspace, cx| {
+ let graphs = workspace.items_of_type::<GitGraph>(cx).collect::<Vec<_>>();
+ assert_eq!(
+ graphs.len(),
+ 1,
+ "dispatching FileHistory from a project diff should open a git graph"
+ );
+ assert_eq!(
+ graphs[0].read(cx).log_source,
+ LogSource::Path(tracked_repo_path)
+ );
+ });
+ }
+
#[gpui::test]
fn test_serialized_state_roundtrip(_cx: &mut TestAppContext) {
use persistence::SerializedGitGraphState;
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index ca41b281fbc..452f6277982 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -4126,7 +4126,14 @@ impl Workspace {
pub fn active_item_as<I: 'static>(&self, cx: &App) -> Option<Entity<I>> {
let item = self.active_item(cx)?;
- item.to_any_view().downcast::<I>().ok()
+ // Prefer an exact downcast so that we return the active item itself when
+ // its concrete type matches, preserving entity identity for callers that
+ // compare `entity_id`s. Fall back to `act_as` so that wrapper items (e.g.
+ // diff views) resolve to the inner view they expose.
+ item.to_any_view()
+ .downcast::<I>()
+ .ok()
+ .or_else(|| item.act_as::<I>(cx))
}
fn active_project_path(&self, cx: &App) -> Option<ProjectPath> {