From 43c1704fb20a07e4fc808e3382493fb9217b6a57 Mon Sep 17 00:00:00 2001 From: Omnikar Date: Fri, 31 Dec 2021 14:09:40 -0500 Subject: [PATCH] Handle `NotFound` and `Cancelled` for keymap lookup --- helix-term/src/commands.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 361a23901..a9b0328bc 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -2829,10 +2829,11 @@ pub mod cmd { { (STATIC_HELP_DIR, arg) } else { + let arg = arg.to_owned().into_owned(); let keys = arg .parse::() .map(|key| vec![key]) - .or_else(|_| helix_view::input::parse_macro(arg))?; + .or_else(|_| helix_view::input::parse_macro(&arg))?; let callback = Box::pin(async move { let call: job::Callback = Box::new(move |editor: &mut Editor, compositor: &mut Compositor| { @@ -2845,16 +2846,23 @@ pub mod cmd { keymap.get(*key); }); let result = keymap.get(*last_key); - let (help_dir, command): (&str, &str) = match &result.kind { + let res: anyhow::Result<(&str, &str)> = match &result.kind { KeymapResultKind::Matched(command) => match command { - MappableCommand::Static { name, .. } => (STATIC_HELP_DIR, name), + MappableCommand::Static { name, .. } => { + Ok((STATIC_HELP_DIR, name)) + } MappableCommand::Typable { name, .. } => { - (TYPABLE_HELP_DIR, name) + Ok((TYPABLE_HELP_DIR, name)) } }, + KeymapResultKind::NotFound | KeymapResultKind::Cancelled(_) => { + Err(anyhow!("No command found for '{}'", arg)) + } _ => todo!(), }; - if let Err(e) = open_help(help_dir, command, editor) { + if let Err(e) = res.and_then(|(help_dir, command)| { + open_help(help_dir, command, editor) + }) { editor.set_error(e.to_string()); } });