myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Remove shortcut numbers (#708)" (#724)

Browse source 
This reverts commit 3fdd4f4591.
This commit is contained in:
Ellie Huxtable 2023-02-24 15:49:05 +00:00 committed by GitHub
parent 3fdd4f4591
commit 5f2db5b93e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/command/client/search/history_list.rs
View file

@ -112,11 +112,14 @@ pub const PREFIX_LENGTH: u16 = " > 123ms 59s ago".len() as u16;
impl DrawState<'_> { impl DrawState<'_> {
fn index(&mut self) { fn index(&mut self) {
if self.y as usize + self.state.offset == self.state.selected { // these encode the slices of `" > "`, `" {n} "`, or `" "` in a compact form.
self.draw(" >> ", Style::default()); // Yes, this is a hack, but it makes me feel happy
} else { static SLICES: &str = " > 1 2 3 4 5 6 7 8 9 ";
self.draw(" ", Style::default());
} let i = self.y as usize + self.state.offset;
let i = i.checked_sub(self.state.selected);
let i = i.unwrap_or(10).min(10) * 2;
self.draw(&SLICES[i..i + 3], Style::default());
} }
fn duration(&mut self, h: &History) { fn duration(&mut self, h: &History) {

5
src/command/client/search/interactive.rs
View file

@ -95,6 +95,7 @@ impl State {
len: usize, len: usize,
) -> Option<usize> { ) -> Option<usize> {
let ctrl = input.modifiers.contains(KeyModifiers::CONTROL); let ctrl = input.modifiers.contains(KeyModifiers::CONTROL);
let alt = input.modifiers.contains(KeyModifiers::ALT);
match input.code { match input.code {
KeyCode::Char('c' | 'd' | 'g') if ctrl => return Some(RETURN_ORIGINAL), KeyCode::Char('c' | 'd' | 'g') if ctrl => return Some(RETURN_ORIGINAL),
KeyCode::Esc => { KeyCode::Esc => {
@ -106,6 +107,10 @@ impl State {
KeyCode::Enter => { KeyCode::Enter => {
return Some(self.results_state.selected()); return Some(self.results_state.selected());
} }
KeyCode::Char(c @ '1'..='9') if alt => {
let c = c.to_digit(10)? as usize;
return Some(self.results_state.selected() + c);
}
KeyCode::Left => { KeyCode::Left => {
self.input.left(); self.input.left();
} }