extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-06-25 20:32:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(search): refactor vim mode (#1559)

Browse Source
This commit is contained in:
Koichi Murase 2024-01-15 08:04:02 +09:00 committed by GitHub
parent 7f4b32de3b
commit 9e3d41eab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
atuin/src/command/client/search/interactive.rs
View File

@ -146,18 +146,26 @@ impl State {
// Use Ctrl-n instead of Alt-n? // Use Ctrl-n instead of Alt-n?
let modfr = if settings.ctrl_n_shortcuts { ctrl } else { alt }; let modfr = if settings.ctrl_n_shortcuts { ctrl } else { alt };
// Common actions
macro_rules! do_exit {
() => {
return match settings.exit_mode {
ExitMode::ReturnOriginal => InputAction::ReturnOriginal,
ExitMode::ReturnQuery => InputAction::ReturnQuery,
}
};
}
// core input handling, common for all tabs // core input handling, common for all tabs
match input.code { match input.code {
KeyCode::Char('c' | 'g') if ctrl => return InputAction::ReturnOriginal, KeyCode::Char('c' | 'g') if ctrl => return InputAction::ReturnOriginal,
KeyCode::Esc if settings.vim && self.vim_mode == VimMode::Insert => { KeyCode::Esc if settings.vim && self.vim_mode == VimMode::Insert => {
let _ = execute!(stdout(), SetCursorStyle::SteadyBlock); let _ = execute!(stdout(), SetCursorStyle::SteadyBlock);
self.vim_mode = VimMode::Normal; self.vim_mode = VimMode::Normal;
return InputAction::Continue;
} }
KeyCode::Esc => { KeyCode::Esc => {
return match settings.exit_mode { do_exit!();
ExitMode::ReturnOriginal => InputAction::ReturnOriginal,
ExitMode::ReturnQuery => InputAction::ReturnQuery,
}
} }
KeyCode::Tab => { KeyCode::Tab => {
return InputAction::Accept(self.results_state.selected()); return InputAction::Accept(self.results_state.selected());
@ -295,31 +303,33 @@ impl State {
self.engine = engines::engine(self.search_mode); self.engine = engines::engine(self.search_mode);
} }
KeyCode::Down if !settings.invert && self.results_state.selected() == 0 => { KeyCode::Down if !settings.invert && self.results_state.selected() == 0 => {
return match settings.exit_mode { do_exit!();
ExitMode::ReturnOriginal => InputAction::ReturnOriginal,
ExitMode::ReturnQuery => InputAction::ReturnQuery,
}
} }
KeyCode::Up if settings.invert && self.results_state.selected() == 0 => { KeyCode::Up if settings.invert && self.results_state.selected() == 0 => {
return match settings.exit_mode { do_exit!();
ExitMode::ReturnOriginal => InputAction::ReturnOriginal,
ExitMode::ReturnQuery => InputAction::ReturnQuery,
}
} }
KeyCode::Char('j') KeyCode::Char('j')
if settings.vim if !ctrl
&& !settings.invert
&& settings.vim
&& self.vim_mode == VimMode::Normal && self.vim_mode == VimMode::Normal
&& self.results_state.selected() == 0 => && self.results_state.selected() == 0 =>
{ {
return match settings.exit_mode { do_exit!();
ExitMode::ReturnOriginal => InputAction::ReturnOriginal,
ExitMode::ReturnQuery => InputAction::ReturnQuery,
}
} }
KeyCode::Char('k') if settings.vim && self.vim_mode == VimMode::Normal => { KeyCode::Char('k')
if !ctrl
&& settings.invert
&& settings.vim
&& self.vim_mode == VimMode::Normal
&& self.results_state.selected() == 0 =>
{
do_exit!();
}
KeyCode::Char('k') if !ctrl && settings.vim && self.vim_mode == VimMode::Normal => {
self.scroll_up(1); self.scroll_up(1);
} }
KeyCode::Char('j') if settings.vim && self.vim_mode == VimMode::Normal => { KeyCode::Char('j') if !ctrl && settings.vim && self.vim_mode == VimMode::Normal => {
self.scroll_down(1); self.scroll_down(1);
} }
KeyCode::Down if !settings.invert => { KeyCode::Down if !settings.invert => {
@ -700,7 +710,6 @@ struct Stdout {
} }
impl Stdout { impl Stdout {
#[cfg(target_os = "windows")]
pub fn new(inline_mode: bool) -> std::io::Result<Self> { pub fn new(inline_mode: bool) -> std::io::Result<Self> {
terminal::enable_raw_mode()?; terminal::enable_raw_mode()?;
let mut stdout = stdout(); let mut stdout = stdout();
@ -715,25 +724,9 @@ impl Stdout {
event::EnableBracketedPaste, event::EnableBracketedPaste,
)?; )?;
Ok(Self { #[cfg(not(target_os = "windows"))]
stdout,
inline_mode,
})
}
#[cfg(not(target_os = "windows"))]
pub fn new(inline_mode: bool) -> std::io::Result<Self> {
terminal::enable_raw_mode()?;
let mut stdout = stdout();
if !inline_mode {
execute!(stdout, terminal::EnterAlternateScreen)?;
}
execute!( execute!(
stdout, stdout,
event::EnableMouseCapture,
event::EnableBracketedPaste,
PushKeyboardEnhancementFlags( PushKeyboardEnhancementFlags(
KeyboardEnhancementFlags::DISAMBIGUATE_ESCAPE_CODES KeyboardEnhancementFlags::DISAMBIGUATE_ESCAPE_CODES
| KeyboardEnhancementFlags::REPORT_ALL_KEYS_AS_ESCAPE_CODES | KeyboardEnhancementFlags::REPORT_ALL_KEYS_AS_ESCAPE_CODES
@ -748,7 +741,6 @@ impl Stdout {
} }
impl Drop for Stdout { impl Drop for Stdout {
#[cfg(target_os = "windows")]
fn drop(&mut self) { fn drop(&mut self) {
if !self.inline_mode { if !self.inline_mode {
execute!(self.stdout, terminal::LeaveAlternateScreen).unwrap(); execute!(self.stdout, terminal::LeaveAlternateScreen).unwrap();
@ -759,21 +751,10 @@ impl Drop for Stdout {
event::DisableBracketedPaste, event::DisableBracketedPaste,
) )
.unwrap(); .unwrap();
terminal::disable_raw_mode().unwrap();
}
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
fn drop(&mut self) { execute!(self.stdout, PopKeyboardEnhancementFlags).unwrap();
if !self.inline_mode {
execute!(self.stdout, terminal::LeaveAlternateScreen).unwrap();
}
execute!(
self.stdout,
event::DisableMouseCapture,
event::DisableBracketedPaste,
PopKeyboardEnhancementFlags
)
.unwrap();
terminal::disable_raw_mode().unwrap(); terminal::disable_raw_mode().unwrap();
} }
} }