TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

key is now modified in place at start of handle_event

Browse source
This commit is contained in:
Jan Hrastnik 2021-06-03 15:26:24 +02:00 • committed by Blaž Hrastnik
parent daad8ebe12
commit c1c3750d38
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
helix-term/src/ui/editor.rs
View file

@ -544,6 +544,7 @@ impl Component for EditorView {
EventResult::Consumed(None)
}
Event::Key(mut key) => {
canonicalize_key(&mut key);
// clear status
cx.editor.status_msg = None;
@ -565,7 +566,7 @@ impl Component for EditorView {
match mode {
Mode::Insert => {
// record last_insert key
self.last_insert.1.push(canonicalize_key(&mut key));
self.last_insert.1.push(key);
// let completion swallow the event if necessary
let mut consumed = false;
@ -590,7 +591,7 @@ impl Component for EditorView {
// if completion didn't take the event, we pass it onto commands
if !consumed {
self.insert_mode(&mut cxt, canonicalize_key(&mut key));
self.insert_mode(&mut cxt, key);
// lastly we recalculate completion
if let Some(completion) = &mut self.completion {
@ -601,7 +602,7 @@ impl Component for EditorView {
}
}
}
mode => self.command_mode(mode, &mut cxt, canonicalize_key(&mut key)),
mode => self.command_mode(mode, &mut cxt, key),
}
}
@ -691,7 +692,7 @@ impl Component for EditorView {
}
}
fn canonicalize_key(key: &mut KeyEvent) -> KeyEvent {
fn canonicalize_key(key: &mut KeyEvent) {
if let KeyEvent {
code: KeyCode::Char(_),
modifiers: _,
@ -699,5 +700,4 @@ fn canonicalize_key(key: &mut KeyEvent) -> KeyEvent {
{
key.modifiers.remove(KeyModifiers::SHIFT)
}
*key
}