aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucy2022-08-31 01:44:06 +0000
committerGitHub2022-08-31 01:44:06 +0000
commit404db2ebee477a9bfdb76e89ebf48adac9c1a57c (patch)
treeb59b338608c1c7ee0cb9626f410f08a5828ece8e
parent78189dd9c1aecd1760cc1baf6e2e81d8abbca48c (diff)
Move mode transition logic to handle_keymap_event() (#2634)
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io> Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
-rw-r--r--helix-term/src/ui/editor.rs78
1 files changed, 42 insertions, 36 deletions
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 92773260..2de5fe5c 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -771,15 +771,55 @@ impl EditorView {
cxt: &mut commands::Context,
event: KeyEvent,
) -> Option<KeymapResult> {
+ let mut last_mode = mode;
let key_result = self.keymaps.get(mode, event);
cxt.editor.autoinfo = self.keymaps.sticky().map(|node| node.infobox());
+ // Track the currently open doc
+ let view = view!(cxt.editor);
+ let doc_id = view.doc;
+
+ let mut execute_command = |command: &commands::MappableCommand| {
+ command.execute(cxt);
+ let doc = cxt.editor.documents.get_mut(&doc_id).unwrap();
+ let current_mode = doc.mode();
+ match (last_mode, current_mode) {
+ (Mode::Normal, Mode::Insert) => {
+ // HAXX: if we just entered insert mode from normal, clear key buf
+ // and record the command that got us into this mode.
+
+ // how we entered insert mode is important, and we should track that so
+ // we can repeat the side effect.
+ self.last_insert.0 = command.clone();
+ self.last_insert.1.clear();
+
+ commands::signature_help_impl(cxt, commands::SignatureHelpInvoked::Automatic);
+ }
+ (Mode::Insert, Mode::Normal) => {
+ // if exiting insert mode, remove completion
+ self.completion = None;
+
+ // TODO: Use an on_mode_change hook to remove signature help
+ cxt.jobs.callback(async {
+ let call: job::Callback = Box::new(|_editor, compositor| {
+ compositor.remove(SignatureHelp::ID);
+ });
+ Ok(call)
+ });
+ }
+ _ => (),
+ }
+ last_mode = current_mode;
+ };
+
match &key_result {
- KeymapResult::Matched(command) => command.execute(cxt),
+ KeymapResult::Matched(command) => {
+ execute_command(command);
+ }
KeymapResult::Pending(node) => cxt.editor.autoinfo = Some(node.infobox()),
KeymapResult::MatchedSequence(commands) => {
for command in commands {
- command.execute(cxt);
+ execute_command(command);
}
}
KeymapResult::NotFound | KeymapResult::Cancelled(_) => return Some(key_result),
@@ -1233,40 +1273,6 @@ impl Component for EditorView {
doc.append_changes_to_history(view.id);
}
- // mode transitions
- match (mode, doc.mode()) {
- (Mode::Normal, Mode::Insert) => {
- // HAXX: if we just entered insert mode from normal, clear key buf
- // and record the command that got us into this mode.
-
- // how we entered insert mode is important, and we should track that so
- // we can repeat the side effect.
-
- self.last_insert.0 = match self.keymaps.get(mode, key) {
- KeymapResult::Matched(command) => command,
- // FIXME: insert mode can only be entered through single KeyCodes
- _ => unimplemented!(),
- };
- self.last_insert.1.clear();
- commands::signature_help_impl(
- &mut cx,
- commands::SignatureHelpInvoked::Automatic,
- );
- }
- (Mode::Insert, Mode::Normal) => {
- // if exiting insert mode, remove completion
- self.completion = None;
- // TODO: Use an on_mode_change hook to remove signature help
- context.jobs.callback(async {
- let call: job::Callback = Box::new(|_editor, compositor| {
- compositor.remove(SignatureHelp::ID);
- });
- Ok(call)
- });
- }
- _ => (),
- }
-
EventResult::Consumed(callback)
}