Skip to content

Right Arrow to modify selected command #2453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 19, 2024
Merged

Right Arrow to modify selected command #2453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
574907a
right arrow functionality
bboynton97 Nov 19, 2024
fbb1a5f
use or within match
bboynton97 Nov 19, 2024
5ef771a
handles cursor not at end of line
bboynton97 Nov 19, 2024
d73de8d
left cursor exits at start
bboynton97 Nov 19, 2024
753d05a
cargo fmt
bboynton97 Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions crates/atuin/src/command/client/search/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ impl Cursor {
pub fn start(&mut self) {
self.index = 0;
}

pub fn position(&self) -> usize {
self.index
}
}

#[cfg(test)]
Expand Down
9 changes: 7 additions & 2 deletions crates/atuin/src/command/client/search/interactive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ impl State {

let ctrl = input.modifiers.contains(KeyModifiers::CONTROL);
let esc_allow_exit = !(self.tab_index == 0 && self.keymap_mode == KeymapMode::VimInsert);
let cursor_at_end_of_line =
self.search.input.position() == UnicodeWidthStr::width(self.search.input.as_str());
let cursor_at_start_of_line = self.search.input.position() == 0;

// support ctrl-a prefix, like screen or tmux
if !self.prefix
Expand All @@ -221,12 +224,14 @@ impl State {
KeyCode::Esc if esc_allow_exit => Some(Self::handle_key_exit(settings)),
KeyCode::Char('[') if ctrl && esc_allow_exit => Some(Self::handle_key_exit(settings)),
KeyCode::Tab => Some(InputAction::Accept(self.results_state.selected())),
KeyCode::Right if cursor_at_end_of_line => {
Some(InputAction::Accept(self.results_state.selected()))
}
KeyCode::Left if cursor_at_start_of_line => Some(Self::handle_key_exit(settings)),
KeyCode::Char('o') if ctrl => {
self.tab_index = (self.tab_index + 1) % TAB_TITLES.len();

Some(InputAction::Continue)
}

_ => None,
};

Expand Down