vim: Display pending keys in Vim mode indicator (#13195)
This changes the mode indicator to now show pending keys and not just pending operators. Release Notes: - Added pending keys to the mode indicator in Vim mode. Demo: https://github.com/zed-industries/zed/assets/1185253/4fc4ffd9-2ba7-4e2c-b2c3-cd19b40cb640
This commit is contained in:
parent
3a26a4809d
commit
195a270e18
2 changed files with 71 additions and 11 deletions
|
@ -539,6 +539,7 @@ pub struct Window {
|
|||
pub(crate) focus: Option<FocusId>,
|
||||
focus_enabled: bool,
|
||||
pending_input: Option<PendingInput>,
|
||||
pending_input_observers: SubscriberSet<(), AnyObserver>,
|
||||
prompt: Option<RenderablePromptHandle>,
|
||||
}
|
||||
|
||||
|
@ -810,6 +811,7 @@ impl Window {
|
|||
focus: None,
|
||||
focus_enabled: true,
|
||||
pending_input: None,
|
||||
pending_input_observers: SubscriberSet::new(),
|
||||
prompt: None,
|
||||
})
|
||||
}
|
||||
|
@ -3128,16 +3130,20 @@ impl<'a> WindowContext<'a> {
|
|||
let Some(currently_pending) = cx.window.pending_input.take() else {
|
||||
return;
|
||||
};
|
||||
cx.replay_pending_input(currently_pending)
|
||||
cx.pending_input_changed();
|
||||
cx.replay_pending_input(currently_pending);
|
||||
})
|
||||
.log_err();
|
||||
}));
|
||||
|
||||
self.window.pending_input = Some(currently_pending);
|
||||
self.pending_input_changed();
|
||||
|
||||
self.propagate_event = false;
|
||||
|
||||
return;
|
||||
} else if let Some(currently_pending) = self.window.pending_input.take() {
|
||||
self.pending_input_changed();
|
||||
if bindings
|
||||
.iter()
|
||||
.all(|binding| !currently_pending.used_by_binding(binding))
|
||||
|
@ -3173,6 +3179,13 @@ impl<'a> WindowContext<'a> {
|
|||
self.dispatch_keystroke_observers(event, None);
|
||||
}
|
||||
|
||||
fn pending_input_changed(&mut self) {
|
||||
self.window
|
||||
.pending_input_observers
|
||||
.clone()
|
||||
.retain(&(), |callback| callback(self));
|
||||
}
|
||||
|
||||
fn dispatch_key_down_up_event(
|
||||
&mut self,
|
||||
event: &dyn Any,
|
||||
|
@ -3230,6 +3243,14 @@ impl<'a> WindowContext<'a> {
|
|||
.has_pending_keystrokes()
|
||||
}
|
||||
|
||||
/// Returns the currently pending input keystrokes that might result in a multi-stroke key binding.
|
||||
pub fn pending_input_keystrokes(&self) -> Option<&[Keystroke]> {
|
||||
self.window
|
||||
.pending_input
|
||||
.as_ref()
|
||||
.map(|pending_input| pending_input.keystrokes.as_slice())
|
||||
}
|
||||
|
||||
fn replay_pending_input(&mut self, currently_pending: PendingInput) {
|
||||
let node_id = self
|
||||
.window
|
||||
|
@ -4037,6 +4058,20 @@ impl<'a, V: 'static> ViewContext<'a, V> {
|
|||
subscription
|
||||
}
|
||||
|
||||
/// Register a callback to be invoked when the window's pending input changes.
|
||||
pub fn observe_pending_input(
|
||||
&mut self,
|
||||
mut callback: impl FnMut(&mut V, &mut ViewContext<V>) + 'static,
|
||||
) -> Subscription {
|
||||
let view = self.view.downgrade();
|
||||
let (subscription, activate) = self.window.pending_input_observers.insert(
|
||||
(),
|
||||
Box::new(move |cx| view.update(cx, |view, cx| callback(view, cx)).is_ok()),
|
||||
);
|
||||
activate();
|
||||
subscription
|
||||
}
|
||||
|
||||
/// Register a listener to be called when the given focus handle receives focus.
|
||||
/// Returns a subscription and persists until the subscription is dropped.
|
||||
pub fn on_focus(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue