diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs index 30b8f7d8aaee5babca0bc5b224b29e48a47601f8..3f9469588d74884015d9d9810f200fa51d8dd721 100644 --- a/crates/collab/src/tests/editor_tests.rs +++ b/crates/collab/src/tests/editor_tests.rs @@ -2038,7 +2038,7 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA // client_b now requests git blame for the open buffer editor_b.update_in(cx_b, |editor_b, window, cx| { assert!(editor_b.blame().is_none()); - editor_b.toggle_git_blame(&editor::actions::ToggleGitBlame {}, window, cx); + editor_b.toggle_git_blame(&git::Blame {}, window, cx); }); cx_a.executor().run_until_parked(); diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs index 5422cf7061ef29212f6607a744ea22507a769de2..76866c2f5c60536e70d3a60e75332d908d923e34 100644 --- a/crates/editor/src/actions.rs +++ b/crates/editor/src/actions.rs @@ -408,7 +408,6 @@ gpui::actions!( Tab, Backtab, ToggleAutoSignatureHelp, - ToggleGitBlame, ToggleGitBlameInline, ToggleIndentGuides, ToggleInlayHints, diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 374de0f925bebdd1b27f6446b29385e83ebde735..af011aa21e3fc513362df713dbf359d96fd9a70f 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -14336,7 +14336,7 @@ impl Editor { pub fn toggle_git_blame( &mut self, - _: &ToggleGitBlame, + _: &::git::Blame, window: &mut Window, cx: &mut Context, ) { diff --git a/crates/git/src/git.rs b/crates/git/src/git.rs index f78557702e56f5eb1568b3f2aa18aaf1c1577079..d108e6719c5fe9c8f416210b34de6183d2ae9e01 100644 --- a/crates/git/src/git.rs +++ b/crates/git/src/git.rs @@ -54,8 +54,10 @@ actions!( Init, ] ); + action_with_deprecated_aliases!(git, RestoreFile, ["editor::RevertFile"]); action_with_deprecated_aliases!(git, Restore, ["editor::RevertSelectedHunks"]); +action_with_deprecated_aliases!(git, Blame, ["editor::ToggleGitBlame"]); /// The length of a Git short SHA. pub const SHORT_SHA_LENGTH: usize = 7; diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rs index 4da1a13148bf33fedc5c623130e9aab8369caf46..c4543bf0986aa4820df734e5689e1cb6f86006be 100644 --- a/crates/zed/src/zed/quick_action_bar.rs +++ b/crates/zed/src/zed/quick_action_bar.rs @@ -359,14 +359,14 @@ impl Render for QuickActionBar { "Column Git Blame", show_git_blame_gutter, IconPosition::Start, - Some(editor::actions::ToggleGitBlame.boxed_clone()), + Some(git::Blame.boxed_clone()), { let editor = editor.clone(); move |window, cx| { editor .update(cx, |editor, cx| { editor.toggle_git_blame( - &editor::actions::ToggleGitBlame, + &git::Blame, window, cx, )