1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-06-01 07:46:05 +02:00

completion is now added to prompt.line

This commit is contained in:
Jan Hrastnik 2020-10-24 14:06:10 +02:00
parent a123cf37a0
commit 956173bcea

View File

@ -35,6 +35,7 @@ pub fn insert_char(&mut self, c: char) {
self.line.insert(self.cursor, c);
self.cursor += 1;
self.completion = (self.completion_fn)(&self.line);
self.exit_selection();
}
pub fn move_char_left(&mut self) {
@ -63,6 +64,7 @@ pub fn delete_char_backwards(&mut self) {
self.cursor -= 1;
self.completion = (self.completion_fn)(&self.line);
}
self.exit_selection();
}
pub fn change_completion_selection(&mut self) {
@ -75,7 +77,18 @@ pub fn change_completion_selection(&mut self) {
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) {
@ -105,7 +118,7 @@ pub fn handle_input(&mut self, key_event: KeyEvent, editor: &mut Editor) {
} => self.move_start(),
KeyEvent {
code: KeyCode::Backspace,
..
modifiers: KeyModifiers::NONE,
} => self.delete_char_backwards(),
KeyEvent {
code: KeyCode::Enter,
@ -114,6 +127,10 @@ pub fn handle_input(&mut self, key_event: KeyEvent, editor: &mut Editor) {
KeyEvent {
code: KeyCode::Tab, ..
} => self.change_completion_selection(),
KeyEvent {
code: KeyCode::Char('q'),
modifiers: KeyModifiers::CONTROL,
} => self.exit_selection(),
_ => (),
}
}