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

Disable next/previous hunk menu items when there are no hunks (#32907)

Browse source 
Closes #32887

Release Notes:

- Button menu hunk is disabled if there are no changes
This commit is contained in:
Alvaro Parker 2025-06-21 17:43:00 -04:00 • committed by GitHub
parent 0ed6b4ef1a
commit 6fb1081b61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/zed/src/zed/quick_action_bar.rs
View file

@ -217,6 +217,12 @@ impl Render for QuickActionBar {
}); });
let editor_selections_dropdown = selection_menu_enabled.then(|| { let editor_selections_dropdown = selection_menu_enabled.then(|| {
let has_diff_hunks = editor
.read(cx)
.buffer()
.read(cx)
.snapshot(cx)
.has_diff_hunks();
let focus = editor.focus_handle(cx); let focus = editor.focus_handle(cx);
PopoverMenu::new("editor-selections-dropdown") PopoverMenu::new("editor-selections-dropdown")
@ -251,8 +257,18 @@ impl Render for QuickActionBar {
.action("Next Problem", Box::new(GoToDiagnostic)) .action("Next Problem", Box::new(GoToDiagnostic))
.action("Previous Problem", Box::new(GoToPreviousDiagnostic)) .action("Previous Problem", Box::new(GoToPreviousDiagnostic))
.separator() .separator()
.action("Next Hunk", Box::new(GoToHunk)) .map(|menu| {
if has_diff_hunks {
menu.action("Next Hunk", Box::new(GoToHunk))
.action("Previous Hunk", Box::new(GoToPreviousHunk)) .action("Previous Hunk", Box::new(GoToPreviousHunk))
} else {
menu.disabled_action("Next Hunk", Box::new(GoToHunk))
.disabled_action(
"Previous Hunk",
Box::new(GoToPreviousHunk),
)
}
})
.separator() .separator()
.action("Move Line Up", Box::new(MoveLineUp)) .action("Move Line Up", Box::new(MoveLineUp))
.action("Move Line Down", Box::new(MoveLineDown)) .action("Move Line Down", Box::new(MoveLineDown))