Rename the editor::ToggleGitBlame action to git::Blame (#26565)

Mikayla Maki , Conrad Irwin , Cole Miller , Nathan Sobo , and Max Brunsfeld created 9 months ago

Release Notes:

- Git Beta: Renamed `editor::ToggleGitBlame` to `git::Blame`

Co-authored-by: Conrad Irwin <[e-mail]>
Co-authored-by: Cole Miller <[e-mail]>
Co-authored-by: Nathan Sobo <[e-mail]>
Co-authored-by: Max Brunsfeld <[e-mail]>

Change summary

crates/collab/src/tests/editor_tests.rs | 2 +-
crates/editor/src/actions.rs            | 1 -
crates/editor/src/editor.rs             | 2 +-
crates/git/src/git.rs                   | 2 ++
crates/zed/src/zed/quick_action_bar.rs  | 4 ++--
5 files changed, 6 insertions(+), 5 deletions(-)

Detailed changes

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();

crates/editor/src/actions.rs

@@ -412,7 +412,6 @@ gpui::actions!(
         Tab,
         Backtab,
         ToggleAutoSignatureHelp,
-        ToggleGitBlame,
         ToggleGitBlameInline,
         ToggleIndentGuides,
         ToggleInlayHints,

crates/editor/src/editor.rs

@@ -14605,7 +14605,7 @@ impl Editor {
 
     pub fn toggle_git_blame(
         &mut self,
-        _: &ToggleGitBlame,
+        _: &::git::Blame,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {

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;

crates/zed/src/zed/quick_action_bar.rs

@@ -383,14 +383,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,
                                                 )