aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaž Hrastnik2020-12-14 06:59:48 +0000
committerBlaž Hrastnik2020-12-14 06:59:48 +0000
commitf92998a14b3017371c6a55756c60c03e126ae23f (patch)
tree0d5c720190bc9054c45f8f2b308895b1a8811fd4
parentca809617b2fb38e70910d30feefabbb21ec0ad7f (diff)
Prompt needs to close on enter.
-rw-r--r--helix-term/src/ui/prompt.rs15
1 files changed, 10 insertions, 5 deletions
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 3ca1a941..f5ef9477 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -151,6 +151,11 @@ impl Component for Prompt {
_ => return EventResult::Ignored,
};
+ let close_fn = EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor| {
+ // remove the layer
+ compositor.pop();
+ })));
+
match event {
KeyEvent {
code: KeyCode::Char(c),
@@ -159,10 +164,7 @@ impl Component for Prompt {
KeyEvent {
code: KeyCode::Esc, ..
} => {
- return EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor| {
- // remove the layer
- compositor.pop();
- })));
+ return close_fn;
}
KeyEvent {
code: KeyCode::Right,
@@ -187,7 +189,10 @@ impl Component for Prompt {
KeyEvent {
code: KeyCode::Enter,
..
- } => (self.callback_fn)(cx.editor, &self.line),
+ } => {
+ (self.callback_fn)(cx.editor, &self.line);
+ return close_fn;
+ }
KeyEvent {
code: KeyCode::Tab, ..
} => self.change_completion_selection(),