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

vim: Fix jj to exit insert mode (#20890)

Browse source 
Release Notes:

- (Preview only) fixed binding `jj` to exit insert mode
This commit is contained in:
Conrad Irwin 2024-11-19 20:00:11 -07:00 • committed by GitHub
parent ad6a07e574
commit 3c57a4071c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/gpui/src/window.rs
View file

@ -3038,7 +3038,7 @@ impl<'a> WindowContext<'a> {
return true; return true;
} }
if let Some(input) = keystroke.ime_key { if let Some(input) = keystroke.with_simulated_ime().ime_key {
if let Some(mut input_handler) = self.window.platform_window.take_input_handler() { if let Some(mut input_handler) = self.window.platform_window.take_input_handler() {
input_handler.dispatch_input(&input, self); input_handler.dispatch_input(&input, self);
self.window.platform_window.set_input_handler(input_handler); self.window.platform_window.set_input_handler(input_handler);
@ -3482,7 +3482,13 @@ impl<'a> WindowContext<'a> {
if !self.propagate_event { if !self.propagate_event {
continue 'replay; continue 'replay;
} }
if let Some(input) = replay.keystroke.ime_key.as_ref().cloned() { if let Some(input) = replay
.keystroke
.with_simulated_ime()
.ime_key
.as_ref()
.cloned()
{
if let Some(mut input_handler) = self.window.platform_window.take_input_handler() { if let Some(mut input_handler) = self.window.platform_window.take_input_handler() {
input_handler.dispatch_input(&input, self); input_handler.dispatch_input(&input, self);
self.window.platform_window.set_input_handler(input_handler) self.window.platform_window.set_input_handler(input_handler)