From e258f0f0441c56eac0623a514814733137d38ee4 Mon Sep 17 00:00:00 2001 From: Josh McKinney Date: Thu, 23 Oct 2025 20:04:15 -0700 Subject: [PATCH] Use Option symbol for mac key hints (#5582) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - show the Option (⌥) symbol in key hints when the TUI is built for macOS so the shortcut text matches the platform terminology ## Testing - cargo test -p codex-tui ------ https://chatgpt.com/codex/tasks/task_i_68fab7505530832992780a9e13fb707b --- codex-rs/tui/src/key_hint.rs | 3 +++ ...__tests__renders_with_queued_messages@macos.snap | 13 +++++++++++++ codex-rs/tui/src/status_indicator_widget.rs | 5 +++++ 3 files changed, 21 insertions(+) create mode 100644 codex-rs/tui/src/snapshots/codex_tui__status_indicator_widget__tests__renders_with_queued_messages@macos.snap diff --git a/codex-rs/tui/src/key_hint.rs b/codex-rs/tui/src/key_hint.rs index b79c2a27..795d1545 100644 --- a/codex-rs/tui/src/key_hint.rs +++ b/codex-rs/tui/src/key_hint.rs @@ -6,6 +6,9 @@ use ratatui::style::Style; use ratatui::style::Stylize; use ratatui::text::Span; +#[cfg(target_os = "macos")] +const ALT_PREFIX: &str = "⌥ + "; +#[cfg(not(target_os = "macos"))] const ALT_PREFIX: &str = "alt + "; const CTRL_PREFIX: &str = "ctrl + "; const SHIFT_PREFIX: &str = "shift + "; diff --git a/codex-rs/tui/src/snapshots/codex_tui__status_indicator_widget__tests__renders_with_queued_messages@macos.snap b/codex-rs/tui/src/snapshots/codex_tui__status_indicator_widget__tests__renders_with_queued_messages@macos.snap new file mode 100644 index 00000000..5974455c --- /dev/null +++ b/codex-rs/tui/src/snapshots/codex_tui__status_indicator_widget__tests__renders_with_queued_messages@macos.snap @@ -0,0 +1,13 @@ +--- +source: tui/src/status_indicator_widget.rs +assertion_line: 289 +expression: terminal.backend() +--- +"• Working (0s • esc to interrupt) " +" " +" ↳ first " +" ↳ second " +" ⌥ + ↑ edit " +" " +" " +" " diff --git a/codex-rs/tui/src/status_indicator_widget.rs b/codex-rs/tui/src/status_indicator_widget.rs index 4bcc5cf2..81efde71 100644 --- a/codex-rs/tui/src/status_indicator_widget.rs +++ b/codex-rs/tui/src/status_indicator_widget.rs @@ -284,6 +284,11 @@ mod tests { terminal .draw(|f| w.render_ref(f.area(), f.buffer_mut())) .expect("draw"); + #[cfg(target_os = "macos")] + insta::with_settings!({ snapshot_suffix => "macos" }, { + insta::assert_snapshot!(terminal.backend()); + }); + #[cfg(not(target_os = "macos"))] insta::assert_snapshot!(terminal.backend()); }