Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename ExpandAllHunkDiffs to ExpandAllDiffHunks (#25369)

Browse source 
This is more consistent with the nomenclature in the rest of Zed.

Release Notes:

- Renamed the `editor::ExpandAllHunkDiffs` action to
`editor::ExpandAllDiffHunks`
This commit is contained in:
Cole Miller 2025-02-21 19:06:03 -05:00 • committed by GitHub
parent ec56755f9e
commit 4118f42d61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/keymaps/default-linux.json
View file

@ -118,7 +118,7 @@
"ctrl-;": "editor::ToggleLineNumbers", "ctrl-;": "editor::ToggleLineNumbers",
"ctrl-k ctrl-r": "git::Restore", "ctrl-k ctrl-r": "git::Restore",
"ctrl-'": "editor::ToggleSelectedDiffHunks", "ctrl-'": "editor::ToggleSelectedDiffHunks",
"ctrl-\"": "editor::ExpandAllHunkDiffs", "ctrl-\"": "editor::ExpandAllDiffHunks",
"ctrl-i": "editor::ShowSignatureHelp", "ctrl-i": "editor::ShowSignatureHelp",
"alt-g b": "editor::ToggleGitBlame", "alt-g b": "editor::ToggleGitBlame",
"menu": "editor::OpenContextMenu", "menu": "editor::OpenContextMenu",

2
assets/keymaps/default-macos.json
View file

@ -133,7 +133,7 @@
"cmd-y": "git::StageAndNext", "cmd-y": "git::StageAndNext",
"cmd-shift-y": "git::UnstageAndNext", "cmd-shift-y": "git::UnstageAndNext",
"cmd-'": "editor::ToggleSelectedDiffHunks", "cmd-'": "editor::ToggleSelectedDiffHunks",
"cmd-\"": "editor::ExpandAllHunkDiffs", "cmd-\"": "editor::ExpandAllDiffHunks",
"cmd-alt-g b": "editor::ToggleGitBlame", "cmd-alt-g b": "editor::ToggleGitBlame",
"cmd-i": "editor::ShowSignatureHelp", "cmd-i": "editor::ShowSignatureHelp",
"ctrl-f12": "editor::GoToDeclaration", "ctrl-f12": "editor::GoToDeclaration",

2
crates/editor/src/actions.rs
View file

@ -280,7 +280,6 @@ gpui::actions!(
DuplicateLineDown, DuplicateLineDown,
DuplicateLineUp, DuplicateLineUp,
DuplicateSelection, DuplicateSelection,
ExpandAllHunkDiffs,
ExpandMacroRecursively, ExpandMacroRecursively,
FindAllReferences, FindAllReferences,
Fold, Fold,
@ -425,3 +424,4 @@ action_as!(go_to_line, ToggleGoToLine as Toggle);
action_with_deprecated_aliases!(editor, OpenSelectedFilename, ["editor::OpenFile"]); action_with_deprecated_aliases!(editor, OpenSelectedFilename, ["editor::OpenFile"]);
action_with_deprecated_aliases!(editor, ToggleSelectedDiffHunks, ["editor::ToggleHunkDiff"]); action_with_deprecated_aliases!(editor, ToggleSelectedDiffHunks, ["editor::ToggleHunkDiff"]);
action_with_deprecated_aliases!(editor, ExpandAllDiffHunks, ["editor::ExpandAllHunkDiffs"]);

2
crates/editor/src/editor.rs
View file

@ -12750,7 +12750,7 @@ impl Editor {
pub fn expand_all_diff_hunks( pub fn expand_all_diff_hunks(
&mut self, &mut self,
_: &ExpandAllHunkDiffs, _: &ExpandAllDiffHunks,
_window: &mut Window, _window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {

10
crates/editor/src/editor_tests.rs
View file

@ -13306,7 +13306,7 @@ async fn test_diff_base_change_with_expanded_diff_hunks(
executor.run_until_parked(); executor.run_until_parked();
cx.update_editor(|editor, window, cx| { cx.update_editor(|editor, window, cx| {
editor.expand_all_diff_hunks(&ExpandAllHunkDiffs, window, cx); editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
}); });
executor.run_until_parked(); executor.run_until_parked();
cx.assert_state_with_diff( cx.assert_state_with_diff(
@ -13634,7 +13634,7 @@ async fn test_edits_around_expanded_insertion_hunks(
executor.run_until_parked(); executor.run_until_parked();
cx.update_editor(|editor, window, cx| { cx.update_editor(|editor, window, cx| {
editor.expand_all_diff_hunks(&ExpandAllHunkDiffs, window, cx); editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
}); });
executor.run_until_parked(); executor.run_until_parked();
@ -13905,7 +13905,7 @@ async fn test_edits_around_expanded_deletion_hunks(
executor.run_until_parked(); executor.run_until_parked();
cx.update_editor(|editor, window, cx| { cx.update_editor(|editor, window, cx| {
editor.expand_all_diff_hunks(&ExpandAllHunkDiffs, window, cx); editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
}); });
executor.run_until_parked(); executor.run_until_parked();
@ -14028,7 +14028,7 @@ async fn test_backspace_after_deletion_hunk(executor: BackgroundExecutor, cx: &m
executor.run_until_parked(); executor.run_until_parked();
cx.update_editor(|editor, window, cx| { cx.update_editor(|editor, window, cx| {
editor.expand_all_diff_hunks(&ExpandAllHunkDiffs, window, cx); editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
}); });
executor.run_until_parked(); executor.run_until_parked();
@ -14109,7 +14109,7 @@ async fn test_edit_after_expanded_modification_hunk(
cx.set_diff_base(&diff_base); cx.set_diff_base(&diff_base);
executor.run_until_parked(); executor.run_until_parked();
cx.update_editor(|editor, window, cx| { cx.update_editor(|editor, window, cx| {
editor.expand_all_diff_hunks(&ExpandAllHunkDiffs, window, cx); editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
}); });
executor.run_until_parked(); executor.run_until_parked();