Rename the editor::ToggleGitBlame action to git::Blame (#26565)
Release Notes: - Git Beta: Renamed `editor::ToggleGitBlame` to `git::Blame` Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com> Co-authored-by: Cole Miller <m@cole-miller.net> Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
parent
43ab7fe0e2
commit
f116b44ae8
5 changed files with 6 additions and 5 deletions
|
@ -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
|
// client_b now requests git blame for the open buffer
|
||||||
editor_b.update_in(cx_b, |editor_b, window, cx| {
|
editor_b.update_in(cx_b, |editor_b, window, cx| {
|
||||||
assert!(editor_b.blame().is_none());
|
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();
|
cx_a.executor().run_until_parked();
|
||||||
|
|
|
@ -412,7 +412,6 @@ gpui::actions!(
|
||||||
Tab,
|
Tab,
|
||||||
Backtab,
|
Backtab,
|
||||||
ToggleAutoSignatureHelp,
|
ToggleAutoSignatureHelp,
|
||||||
ToggleGitBlame,
|
|
||||||
ToggleGitBlameInline,
|
ToggleGitBlameInline,
|
||||||
ToggleIndentGuides,
|
ToggleIndentGuides,
|
||||||
ToggleInlayHints,
|
ToggleInlayHints,
|
||||||
|
|
|
@ -14605,7 +14605,7 @@ impl Editor {
|
||||||
|
|
||||||
pub fn toggle_git_blame(
|
pub fn toggle_git_blame(
|
||||||
&mut self,
|
&mut self,
|
||||||
_: &ToggleGitBlame,
|
_: &::git::Blame,
|
||||||
window: &mut Window,
|
window: &mut Window,
|
||||||
cx: &mut Context<Self>,
|
cx: &mut Context<Self>,
|
||||||
) {
|
) {
|
||||||
|
|
|
@ -54,8 +54,10 @@ actions!(
|
||||||
Init,
|
Init,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
action_with_deprecated_aliases!(git, RestoreFile, ["editor::RevertFile"]);
|
action_with_deprecated_aliases!(git, RestoreFile, ["editor::RevertFile"]);
|
||||||
action_with_deprecated_aliases!(git, Restore, ["editor::RevertSelectedHunks"]);
|
action_with_deprecated_aliases!(git, Restore, ["editor::RevertSelectedHunks"]);
|
||||||
|
action_with_deprecated_aliases!(git, Blame, ["editor::ToggleGitBlame"]);
|
||||||
|
|
||||||
/// The length of a Git short SHA.
|
/// The length of a Git short SHA.
|
||||||
pub const SHORT_SHA_LENGTH: usize = 7;
|
pub const SHORT_SHA_LENGTH: usize = 7;
|
||||||
|
|
|
@ -383,14 +383,14 @@ impl Render for QuickActionBar {
|
||||||
"Column Git Blame",
|
"Column Git Blame",
|
||||||
show_git_blame_gutter,
|
show_git_blame_gutter,
|
||||||
IconPosition::Start,
|
IconPosition::Start,
|
||||||
Some(editor::actions::ToggleGitBlame.boxed_clone()),
|
Some(git::Blame.boxed_clone()),
|
||||||
{
|
{
|
||||||
let editor = editor.clone();
|
let editor = editor.clone();
|
||||||
move |window, cx| {
|
move |window, cx| {
|
||||||
editor
|
editor
|
||||||
.update(cx, |editor, cx| {
|
.update(cx, |editor, cx| {
|
||||||
editor.toggle_git_blame(
|
editor.toggle_git_blame(
|
||||||
&editor::actions::ToggleGitBlame,
|
&git::Blame,
|
||||||
window,
|
window,
|
||||||
cx,
|
cx,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue