Merge pull request #1961 from zed-industries/fix-next-screen-bug

Fixed issue where the NextScreen action would never have an effect
This commit is contained in:
Mikayla Maki 2022-12-12 15:47:16 -08:00 committed by GitHub
commit 8012e9fcbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View file

@ -184,7 +184,6 @@ actions!(
Paste,
Undo,
Redo,
NextScreen,
MoveUp,
PageUp,
MoveDown,

View file

@ -64,15 +64,15 @@ impl Editor {
return None;
}
self.context_menu.as_mut()?;
if self.mouse_context_menu.read(cx).visible() {
return None;
}
if matches!(self.mode, EditorMode::SingleLine) {
cx.propagate_action();
return None;
}
self.request_autoscroll(Autoscroll::Next, cx);
Some(())
}