From 76a03c489aa9603928a0e54f769d3699b0505031 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Sun, 19 Apr 2026 18:18:37 -0300 Subject: [PATCH] fix(tui): annotate keymap literal arguments Add argument comments to keymap-related TUI callsites that pass opaque literal values, keeping them compliant with the anonymous argument lint. --- .../tui/src/bottom_pane/approval_overlay.rs | 14 ++++++++++---- codex-rs/tui/src/bottom_pane/chat_composer.rs | 6 +++--- codex-rs/tui/src/bottom_pane/textarea.rs | 4 ++-- codex-rs/tui/src/onboarding/auth.rs | 10 +++++----- codex-rs/tui/src/onboarding/welcome.rs | 6 +++++- codex-rs/tui/src/pager_overlay.rs | 19 +++++++++++++------ 6 files changed, 38 insertions(+), 21 deletions(-) diff --git a/codex-rs/tui/src/bottom_pane/approval_overlay.rs b/codex-rs/tui/src/bottom_pane/approval_overlay.rs index db3c645d8a..c3f6ee7826 100644 --- a/codex-rs/tui/src/bottom_pane/approval_overlay.rs +++ b/codex-rs/tui/src/bottom_pane/approval_overlay.rs @@ -1248,8 +1248,11 @@ mod tests { }; let view = make_overlay(exec_request, tx, Features::with_defaults()); - let mut buf = Buffer::empty(Rect::new(0, 0, 80, view.desired_height(80))); - view.render(Rect::new(0, 0, 80, view.desired_height(80)), &mut buf); + let mut buf = Buffer::empty(Rect::new(0, 0, 80, view.desired_height(/*width*/ 80))); + view.render( + Rect::new(0, 0, 80, view.desired_height(/*width*/ 80)), + &mut buf, + ); let rendered: Vec = (0..buf.area.height) .map(|row| { @@ -1421,8 +1424,11 @@ mod tests { }; let view = make_overlay(exec_request, tx, Features::with_defaults()); - let mut buf = Buffer::empty(Rect::new(0, 0, 100, view.desired_height(100))); - view.render(Rect::new(0, 0, 100, view.desired_height(100)), &mut buf); + let mut buf = Buffer::empty(Rect::new(0, 0, 100, view.desired_height(/*width*/ 100))); + view.render( + Rect::new(0, 0, 100, view.desired_height(/*width*/ 100)), + &mut buf, + ); let rendered: Vec = (0..buf.area.height) .map(|row| { diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs index 8204dc522d..ec0e352d77 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs @@ -5089,11 +5089,11 @@ mod tests { let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); let mut composer = ChatComposer::new( - true, + /*has_input_focus*/ true, sender, - false, + /*enhanced_keys_supported*/ false, "Ask Codex to do anything".to_string(), - false, + /*disable_paste_burst*/ false, ); composer.set_steer_enabled(true); diff --git a/codex-rs/tui/src/bottom_pane/textarea.rs b/codex-rs/tui/src/bottom_pane/textarea.rs index 2322882ced..ee0e6f096a 100644 --- a/codex-rs/tui/src/bottom_pane/textarea.rs +++ b/codex-rs/tui/src/bottom_pane/textarea.rs @@ -396,7 +396,7 @@ impl TextArea { } if keymap.delete_backward.is_pressed(event) { - self.delete_backward(1); + self.delete_backward(/*n*/ 1); return; } if keymap.delete_forward_word.is_pressed(event) { @@ -404,7 +404,7 @@ impl TextArea { return; } if keymap.delete_forward.is_pressed(event) { - self.delete_forward(1); + self.delete_forward(/*n*/ 1); return; } if keymap.kill_line_start.is_pressed(event) { diff --git a/codex-rs/tui/src/onboarding/auth.rs b/codex-rs/tui/src/onboarding/auth.rs index aedab87290..ce2f8189ec 100644 --- a/codex-rs/tui/src/onboarding/auth.rs +++ b/codex-rs/tui/src/onboarding/auth.rs @@ -198,23 +198,23 @@ impl KeyboardHandler for AuthModeWidget { } if self.onboarding_keymap.move_up.is_pressed(key_event) { - self.move_highlight(-1); + self.move_highlight(/*delta*/ -1); return; } if self.onboarding_keymap.move_down.is_pressed(key_event) { - self.move_highlight(1); + self.move_highlight(/*delta*/ 1); return; } if self.onboarding_keymap.select_first.is_pressed(key_event) { - self.select_option_by_index(0); + self.select_option_by_index(/*index*/ 0); return; } if self.onboarding_keymap.select_second.is_pressed(key_event) { - self.select_option_by_index(1); + self.select_option_by_index(/*index*/ 1); return; } if self.onboarding_keymap.select_third.is_pressed(key_event) { - self.select_option_by_index(2); + self.select_option_by_index(/*index*/ 2); return; } if self.onboarding_keymap.confirm.is_pressed(key_event) { diff --git a/codex-rs/tui/src/onboarding/welcome.rs b/codex-rs/tui/src/onboarding/welcome.rs index 53953ab646..42848a5112 100644 --- a/codex-rs/tui/src/onboarding/welcome.rs +++ b/codex-rs/tui/src/onboarding/welcome.rs @@ -206,7 +206,11 @@ mod tests { fn ctrl_shift_dot_changes_animation_variant() { let mut widget = WelcomeWidget { is_logged_in: false, - animation: AsciiAnimation::with_variants(FrameRequester::test_dummy(), &VARIANTS, 0), + animation: AsciiAnimation::with_variants( + FrameRequester::test_dummy(), + &VARIANTS, + /*variant_idx*/ 0, + ), animations_enabled: true, animations_suppressed: Cell::new(false), toggle_animation_keys: crate::keymap::RuntimeKeymap::defaults() diff --git a/codex-rs/tui/src/pager_overlay.rs b/codex-rs/tui/src/pager_overlay.rs index 4a3e819631..a25c1f7dda 100644 --- a/codex-rs/tui/src/pager_overlay.rs +++ b/codex-rs/tui/src/pager_overlay.rs @@ -767,7 +767,7 @@ impl StaticOverlay { keymap: PagerKeymap, ) -> Self { Self { - view: PagerView::new(renderables, title, 0, keymap), + view: PagerView::new(renderables, title, /*scroll_offset*/ 0, keymap), is_done: false, } } @@ -1299,9 +1299,12 @@ mod tests { #[test] fn pager_view_content_height_counts_renderables() { let pv = pager_view( - vec![paragraph_block("a", 2), paragraph_block("b", 3)], + vec![ + paragraph_block("a", /*lines*/ 2), + paragraph_block("b", /*lines*/ 3), + ], "T", - 0, + /*scroll_offset*/ 0, ); assert_eq!(pv.content_height(/*width*/ 80), 5); @@ -1316,7 +1319,7 @@ mod tests { paragraph_block("c", /*lines*/ 3), ], "T", - 0, + /*scroll_offset*/ 0, ); let area = Rect::new(0, 0, 20, 8); @@ -1351,7 +1354,7 @@ mod tests { paragraph_block("c", /*lines*/ 3), ], "T", - 0, + /*scroll_offset*/ 0, ); let area = Rect::new(0, 0, 20, 3); @@ -1363,7 +1366,11 @@ mod tests { #[test] fn pager_view_is_scrolled_to_bottom_accounts_for_wrapped_height() { - let mut pv = pager_view(vec![paragraph_block("a", 10)], "T", 0); + let mut pv = pager_view( + vec![paragraph_block("a", /*lines*/ 10)], + "T", + /*scroll_offset*/ 0, + ); let area = Rect::new(0, 0, 20, 8); let mut buf = Buffer::empty(area);