diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs index 4fbdd5509..463ac3682 100644 --- a/helix-term/src/ui/mod.rs +++ b/helix-term/src/ui/mod.rs @@ -194,7 +194,7 @@ pub mod completers { .collect(); matches.sort_unstable_by_key(|(_file, score)| Reverse(*score)); - files = matches.into_iter().map(|(file, _)| file.into()).collect(); + files = matches.into_iter().map(|(file, _)| file).collect(); // TODO: complete to longest common match } diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs index ba32e6b52..e0f7a5c0a 100644 --- a/helix-term/src/ui/popup.rs +++ b/helix-term/src/ui/popup.rs @@ -57,9 +57,7 @@ impl Component for Popup { | KeyEvent { code: KeyCode::Char('c'), modifiers: KeyModifiers::CONTROL, - } => { - return close_fn; - } + } => close_fn, _ => self.contents.handle_event(event, cx), } // for some events, we want to process them but send ignore, specifically all input except