completion is now added to prompt.line

pull/4/head
Jan Hrastnik 4 years ago
parent a123cf37a0
commit 956173bcea

@ -35,6 +35,7 @@ impl Prompt {
self.line.insert(self.cursor, c); self.line.insert(self.cursor, c);
self.cursor += 1; self.cursor += 1;
self.completion = (self.completion_fn)(&self.line); self.completion = (self.completion_fn)(&self.line);
self.exit_selection();
} }
pub fn move_char_left(&mut self) { pub fn move_char_left(&mut self) {
@ -63,6 +64,7 @@ impl Prompt {
self.cursor -= 1; self.cursor -= 1;
self.completion = (self.completion_fn)(&self.line); self.completion = (self.completion_fn)(&self.line);
} }
self.exit_selection();
} }
pub fn change_completion_selection(&mut self) { pub fn change_completion_selection(&mut self) {
@ -75,7 +77,18 @@ impl Prompt {
i + 1 i + 1
} }
}) })
.or(Some(0)) .or(Some(0));
self.line = String::from(
self.completion
.as_ref()
.unwrap()
.get(self.completion_selection_index.unwrap())
.unwrap(),
);
}
pub fn exit_selection(&mut self) {
self.completion_selection_index = None;
} }
pub fn handle_input(&mut self, key_event: KeyEvent, editor: &mut Editor) { pub fn handle_input(&mut self, key_event: KeyEvent, editor: &mut Editor) {
@ -105,7 +118,7 @@ impl Prompt {
} => self.move_start(), } => self.move_start(),
KeyEvent { KeyEvent {
code: KeyCode::Backspace, code: KeyCode::Backspace,
.. modifiers: KeyModifiers::NONE,
} => self.delete_char_backwards(), } => self.delete_char_backwards(),
KeyEvent { KeyEvent {
code: KeyCode::Enter, code: KeyCode::Enter,
@ -114,6 +127,10 @@ impl Prompt {
KeyEvent { KeyEvent {
code: KeyCode::Tab, .. code: KeyCode::Tab, ..
} => self.change_completion_selection(), } => self.change_completion_selection(),
KeyEvent {
code: KeyCode::Char('q'),
modifiers: KeyModifiers::CONTROL,
} => self.exit_selection(),
_ => (), _ => (),
} }
} }

Loading…
Cancel
Save