suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prompt needs to close on enter.

pull/7/head
Blaž Hrastnik 2020-12-14 15:59:48 +09:00
parent ca809617b2
commit f92998a14b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
helix-term/src/ui/prompt.rs
View File

@ -151,6 +151,11 @@ impl Component for Prompt {
_ => return EventResult::Ignored, _ => return EventResult::Ignored,
}; };
let close_fn = EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor| {
// remove the layer
compositor.pop();
})));
match event { match event {
KeyEvent { KeyEvent {
code: KeyCode::Char(c), code: KeyCode::Char(c),
@ -159,10 +164,7 @@ impl Component for Prompt {
KeyEvent { KeyEvent {
code: KeyCode::Esc, .. code: KeyCode::Esc, ..
} => { } => {
return EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor| { return close_fn;
// remove the layer
compositor.pop();
})));
} }
KeyEvent { KeyEvent {
code: KeyCode::Right, code: KeyCode::Right,
@ -187,7 +189,10 @@ impl Component for Prompt {
KeyEvent { KeyEvent {
code: KeyCode::Enter, code: KeyCode::Enter,
.. ..
} => (self.callback_fn)(cx.editor, &self.line), } => {
(self.callback_fn)(cx.editor, &self.line);
return close_fn;
}
KeyEvent { KeyEvent {
code: KeyCode::Tab, .. code: KeyCode::Tab, ..
} => self.change_completion_selection(), } => self.change_completion_selection(),