mirror of
https://github.com/ellie/atuin.git
synced 2024-09-11 21:18:22 +03:00
Add support for some additional keys in interactive mode (#634)
* Ignore tab key in interactive mode * Support home and end keys in interactive mode * Support delete key in interactive mode
This commit is contained in:
parent
478af1fa0f
commit
1d9ce94f96
@ -57,13 +57,17 @@ impl Cursor {
|
||||
self.index += c.len_utf8();
|
||||
}
|
||||
|
||||
pub fn remove(&mut self) -> char {
|
||||
self.source.remove(self.index)
|
||||
pub fn remove(&mut self) -> Option<char> {
|
||||
if self.index < self.source.len() {
|
||||
Some(self.source.remove(self.index))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
pub fn back(&mut self) -> Option<char> {
|
||||
if self.left() {
|
||||
Some(self.remove())
|
||||
self.remove()
|
||||
} else {
|
||||
None
|
||||
}
|
||||
|
@ -69,6 +69,7 @@ impl State {
|
||||
len: usize,
|
||||
) -> Option<usize> {
|
||||
match input {
|
||||
TermEvent::Key(Key::Char('\t')) => {}
|
||||
TermEvent::Key(Key::Ctrl('c' | 'd' | 'g')) => return Some(RETURN_ORIGINAL),
|
||||
TermEvent::Key(Key::Esc) => {
|
||||
return Some(match settings.exit_mode {
|
||||
@ -87,12 +88,15 @@ impl State {
|
||||
self.input.left();
|
||||
}
|
||||
TermEvent::Key(Key::Right | Key::Ctrl('l')) => self.input.right(),
|
||||
TermEvent::Key(Key::Ctrl('a')) => self.input.start(),
|
||||
TermEvent::Key(Key::Ctrl('e')) => self.input.end(),
|
||||
TermEvent::Key(Key::Ctrl('a') | Key::Home) => self.input.start(),
|
||||
TermEvent::Key(Key::Ctrl('e') | Key::End) => self.input.end(),
|
||||
TermEvent::Key(Key::Char(c)) => self.input.insert(*c),
|
||||
TermEvent::Key(Key::Backspace) => {
|
||||
self.input.back();
|
||||
}
|
||||
TermEvent::Key(Key::Delete) => {
|
||||
self.input.remove();
|
||||
}
|
||||
TermEvent::Key(Key::Ctrl('w')) => {
|
||||
// remove the first batch of whitespace
|
||||
while matches!(self.input.back(), Some(c) if c.is_whitespace()) {}
|
||||
|
Loading…
Reference in New Issue
Block a user