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

Make Ctrl-d behaviour match other tools (#1040)

Browse source 
With this change Ctrl-d behaves differently depending on whether there
is any input text available. If there is, it will delete the character
to the right of the cursor if there is any. If there isn't it will
instead quit interactive mode and leave the original shell command line
unchanged.
This matches other line-based tools like bash and fzf.
This commit is contained in:
Jan Larres 2023-06-12 08:48:32 +12:00 committed by GitHub
parent a224a8e4d3
commit dccdb2c33f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atuin/src/command/client/search/interactive.rs
View file

@ -105,7 +105,7 @@ impl State {
// reset the state, will be set to true later if user really did change it // reset the state, will be set to true later if user really did change it
self.switched_search_mode = false; self.switched_search_mode = false;
match input.code { match input.code {
KeyCode::Char('c' | 'd' | 'g') if ctrl => return Some(RETURN_ORIGINAL), KeyCode::Char('c' | 'g') if ctrl => return Some(RETURN_ORIGINAL),
KeyCode::Esc => { KeyCode::Esc => {
return Some(match settings.exit_mode { return Some(match settings.exit_mode {
ExitMode::ReturnOriginal => RETURN_ORIGINAL, ExitMode::ReturnOriginal => RETURN_ORIGINAL,
@ -165,6 +165,12 @@ impl State {
KeyCode::Delete => { KeyCode::Delete => {
self.search.input.remove(); self.search.input.remove();
} }
KeyCode::Char('d') if ctrl => {
if self.search.input.as_str().is_empty() {
return Some(RETURN_ORIGINAL);
}
self.search.input.remove();
}
KeyCode::Char('w') if ctrl => { KeyCode::Char('w') if ctrl => {
// remove the first batch of whitespace // remove the first batch of whitespace
while matches!(self.search.input.back(), Some(c) if c.is_whitespace()) {} while matches!(self.search.input.back(), Some(c) if c.is_whitespace()) {}