Lightweight coding agent that runs in your terminal
Rust
Move Vim history tests into the history search module (#41613)
Benjamin Carlssondde85b435b16
diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rsindex ee05924377..189518676e 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer.rs+++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs@@ -9700,7 +9700,7 @@ mod tests {}// Test helper: simulate human typing with a brief delay and flush the paste-burst buffer- fn type_chars_humanlike(composer: &mut ChatComposer, chars: &[char]) {+ pub(super) fn type_chars_humanlike(composer: &mut ChatComposer, chars: &[char]) {use crossterm::event::KeyCode;use crossterm::event::KeyEvent;use crossterm::event::KeyEventKind;@@ -11309,148 +11309,6 @@ mod tests {);}- #[test]- fn vim_normal_j_k_navigate_history_at_history_boundaries() {- let (tx, _rx) = unbounded_channel::<AppEvent>();- let sender = AppEventSender::new(tx);- let mut composer = ChatComposer::new(- /*has_input_focus*/ true,- sender,- /*enhanced_keys_supported*/ false,- "Ask Codex to do anything".to_string(),- /*disable_paste_burst*/ false,- );-- type_chars_humanlike(&mut composer, &['f', 'i', 'r', 's', 't']);- let (result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));- assert!(matches!(result, InputResult::Submitted { .. }));-- type_chars_humanlike(&mut composer, &['s', 'e', 'c', 'o', 'n', 'd']);- let (result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));- assert!(matches!(result, InputResult::Submitted { .. }));-- composer.set_vim_enabled(/*enabled*/ true);-- let (_result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));- assert_eq!(composer.draft.textarea.text(), "second");- assert_eq!(composer.draft.textarea.cursor(), "second".len() - 1);-- let (_result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));- assert_eq!(composer.draft.textarea.text(), "first");- assert_eq!(composer.draft.textarea.cursor(), "first".len() - 1);-- let (_result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Char('j'), KeyModifiers::NONE));- assert_eq!(composer.draft.textarea.text(), "second");- assert_eq!(composer.draft.textarea.cursor(), "second".len() - 1);-- let (_result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Char('j'), KeyModifiers::NONE));- assert!(composer.draft.textarea.is_empty());- assert_eq!(- composer.draft.textarea.cursor(),- composer.draft.textarea.text().len()- );- }-- #[test]- fn remapped_vim_normal_history_navigation_does_not_fall_back_to_j_k() {- use crate::key_hint;- use crate::keymap::RuntimeKeymap;-- let (tx, _rx) = unbounded_channel::<AppEvent>();- let sender = AppEventSender::new(tx);- let mut composer = ChatComposer::new(- /*has_input_focus*/ true,- sender,- /*enhanced_keys_supported*/ false,- "Ask Codex to do anything".to_string(),- /*disable_paste_burst*/ false,- );-- type_chars_humanlike(&mut composer, &['f', 'i', 'r', 's', 't']);- let (result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));- assert!(matches!(result, InputResult::Submitted { .. }));-- let mut keymap = RuntimeKeymap::defaults();- keymap.vim_normal.move_up = vec![key_hint::plain(KeyCode::F(2))];- keymap.vim_normal.move_down = vec![key_hint::plain(KeyCode::F(3))];- composer.set_keymap_bindings(&keymap);- composer.set_vim_enabled(/*enabled*/ true);-- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));- assert!(composer.draft.textarea.is_empty());-- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::F(2), KeyModifiers::NONE));- assert_eq!(composer.draft.textarea.text(), "first");-- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::F(3), KeyModifiers::NONE));- assert!(composer.draft.textarea.is_empty());- }-- #[test]- fn vim_normal_j_k_fall_back_to_multiline_cursor_movement() {- let (tx, _rx) = unbounded_channel::<AppEvent>();- let sender = AppEventSender::new(tx);- let mut composer = ChatComposer::new(- /*has_input_focus*/ true,- sender,- /*enhanced_keys_supported*/ false,- "Ask Codex to do anything".to_string(),- /*disable_paste_burst*/ false,- );- composer- .draft- .textarea- .set_text_clearing_elements("one\ntwo");- composer.draft.textarea.set_cursor(/*pos*/ 0);- composer.set_vim_enabled(/*enabled*/ true);-- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('j'), KeyModifiers::NONE));- assert_eq!(composer.draft.textarea.cursor(), "one\n".len());-- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));- assert_eq!(composer.draft.textarea.cursor(), 0);- }-- #[test]- fn vim_normal_operator_motion_does_not_navigate_history() {- let (tx, _rx) = unbounded_channel::<AppEvent>();- let sender = AppEventSender::new(tx);- let mut composer = ChatComposer::new(- /*has_input_focus*/ true,- sender,- /*enhanced_keys_supported*/ false,- "Ask Codex to do anything".to_string(),- /*disable_paste_burst*/ false,- );-- type_chars_humanlike(&mut composer, &['f', 'i', 'r', 's', 't']);- let (result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));- assert!(matches!(result, InputResult::Submitted { .. }));-- type_chars_humanlike(&mut composer, &['s', 'e', 'c', 'o', 'n', 'd']);- let (result, _needs_redraw) =- composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));- assert!(matches!(result, InputResult::Submitted { .. }));-- composer.set_vim_enabled(/*enabled*/ true);-- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));- assert_eq!(composer.draft.textarea.text(), "second");-- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('d'), KeyModifiers::NONE));- let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));- assert!(composer.draft.textarea.is_empty());- assert_eq!(composer.current_text(), "");- }-#[test]fn vim_normal_operator_pending_consumes_submit_key() {let (tx, _rx) = unbounded_channel::<AppEvent>();diff --git a/codex-rs/tui/src/bottom_pane/chat_composer/history_search.rs b/codex-rs/tui/src/bottom_pane/chat_composer/history_search.rsindex e1141c7768..a79a10a362 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer/history_search.rs+++ b/codex-rs/tui/src/bottom_pane/chat_composer/history_search.rs@@ -499,11 +499,155 @@ mod tests {use super::super::super::chat_composer_history::HistorySearchResult;use super::super::super::footer::FooterMode;use super::super::ChatComposer;+ use super::super::InputResult;+ use super::super::tests::type_chars_humanlike;use super::HistorySearchStatus;use crate::app_event::AppEvent;use crate::app_event_sender::AppEventSender;use crate::render::renderable::Renderable;+ #[test]+ fn vim_normal_j_k_navigate_history_at_history_boundaries() {+ let (tx, _rx) = unbounded_channel::<AppEvent>();+ let sender = AppEventSender::new(tx);+ let mut composer = ChatComposer::new(+ /*has_input_focus*/ true,+ sender,+ /*enhanced_keys_supported*/ false,+ "Ask Codex to do anything".to_string(),+ /*disable_paste_burst*/ false,+ );++ type_chars_humanlike(&mut composer, &['f', 'i', 'r', 's', 't']);+ let (result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));+ assert!(matches!(result, InputResult::Submitted { .. }));++ type_chars_humanlike(&mut composer, &['s', 'e', 'c', 'o', 'n', 'd']);+ let (result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));+ assert!(matches!(result, InputResult::Submitted { .. }));++ composer.set_vim_enabled(/*enabled*/ true);++ let (_result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));+ assert_eq!(composer.draft.textarea.text(), "second");+ assert_eq!(composer.draft.textarea.cursor(), "second".len() - 1);++ let (_result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));+ assert_eq!(composer.draft.textarea.text(), "first");+ assert_eq!(composer.draft.textarea.cursor(), "first".len() - 1);++ let (_result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Char('j'), KeyModifiers::NONE));+ assert_eq!(composer.draft.textarea.text(), "second");+ assert_eq!(composer.draft.textarea.cursor(), "second".len() - 1);++ let (_result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Char('j'), KeyModifiers::NONE));+ assert!(composer.draft.textarea.is_empty());+ assert_eq!(+ composer.draft.textarea.cursor(),+ composer.draft.textarea.text().len()+ );+ }++ #[test]+ fn remapped_vim_normal_history_navigation_does_not_fall_back_to_j_k() {+ use crate::key_hint;+ use crate::keymap::RuntimeKeymap;++ let (tx, _rx) = unbounded_channel::<AppEvent>();+ let sender = AppEventSender::new(tx);+ let mut composer = ChatComposer::new(+ /*has_input_focus*/ true,+ sender,+ /*enhanced_keys_supported*/ false,+ "Ask Codex to do anything".to_string(),+ /*disable_paste_burst*/ false,+ );++ type_chars_humanlike(&mut composer, &['f', 'i', 'r', 's', 't']);+ let (result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));+ assert!(matches!(result, InputResult::Submitted { .. }));++ let mut keymap = RuntimeKeymap::defaults();+ keymap.vim_normal.move_up = vec![key_hint::plain(KeyCode::F(2))];+ keymap.vim_normal.move_down = vec![key_hint::plain(KeyCode::F(3))];+ composer.set_keymap_bindings(&keymap);+ composer.set_vim_enabled(/*enabled*/ true);++ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));+ assert!(composer.draft.textarea.is_empty());++ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::F(2), KeyModifiers::NONE));+ assert_eq!(composer.draft.textarea.text(), "first");++ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::F(3), KeyModifiers::NONE));+ assert!(composer.draft.textarea.is_empty());+ }++ #[test]+ fn vim_normal_j_k_fall_back_to_multiline_cursor_movement() {+ let (tx, _rx) = unbounded_channel::<AppEvent>();+ let sender = AppEventSender::new(tx);+ let mut composer = ChatComposer::new(+ /*has_input_focus*/ true,+ sender,+ /*enhanced_keys_supported*/ false,+ "Ask Codex to do anything".to_string(),+ /*disable_paste_burst*/ false,+ );+ composer+ .draft+ .textarea+ .set_text_clearing_elements("one\ntwo");+ composer.draft.textarea.set_cursor(/*pos*/ 0);+ composer.set_vim_enabled(/*enabled*/ true);++ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('j'), KeyModifiers::NONE));+ assert_eq!(composer.draft.textarea.cursor(), "one\n".len());++ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));+ assert_eq!(composer.draft.textarea.cursor(), 0);+ }++ #[test]+ fn vim_normal_operator_motion_does_not_navigate_history() {+ let (tx, _rx) = unbounded_channel::<AppEvent>();+ let sender = AppEventSender::new(tx);+ let mut composer = ChatComposer::new(+ /*has_input_focus*/ true,+ sender,+ /*enhanced_keys_supported*/ false,+ "Ask Codex to do anything".to_string(),+ /*disable_paste_burst*/ false,+ );++ type_chars_humanlike(&mut composer, &['f', 'i', 'r', 's', 't']);+ let (result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));+ assert!(matches!(result, InputResult::Submitted { .. }));++ type_chars_humanlike(&mut composer, &['s', 'e', 'c', 'o', 'n', 'd']);+ let (result, _needs_redraw) =+ composer.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));+ assert!(matches!(result, InputResult::Submitted { .. }));++ composer.set_vim_enabled(/*enabled*/ true);++ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));+ assert_eq!(composer.draft.textarea.text(), "second");++ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('d'), KeyModifiers::NONE));+ let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char('k'), KeyModifiers::NONE));+ assert!(composer.draft.textarea.is_empty());+ assert_eq!(composer.current_text(), "");+ }+#[test]fn history_search_opens_without_previewing_latest_entry() {let (tx, _rx) = unbounded_channel::<AppEvent>();