From 3e9eabcbc19996f55b031c6c6e1e2205048183d7 Mon Sep 17 00:00:00 2001 From: iceweasel-oai Date: Thu, 30 Oct 2025 11:49:55 -0700 Subject: [PATCH] skip bash highlighting on Windows due to stack overflow crash --- codex-rs/tui/src/render/highlight.rs | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/codex-rs/tui/src/render/highlight.rs b/codex-rs/tui/src/render/highlight.rs index e6d200cc3d..557a131c81 100644 --- a/codex-rs/tui/src/render/highlight.rs +++ b/codex-rs/tui/src/render/highlight.rs @@ -1,6 +1,7 @@ +use ratatui::text::Line; + use ratatui::style::Style; use ratatui::style::Stylize; -use ratatui::text::Line; use ratatui::text::Span; use std::sync::OnceLock; use tree_sitter_highlight::Highlight; @@ -109,6 +110,11 @@ fn push_segment(lines: &mut Vec>, segment: &str, style: Option Vec> { + // Runtime gate: on Windows, skip bash-specific highlighting and return plain text. + if cfg!(target_os = "windows") { + return vec![script.to_string().into()]; + } + let mut highlighter = Highlighter::new(); let iterator = match highlighter.highlight(highlight_config(), script.as_bytes(), None, |_| None) { @@ -147,8 +153,11 @@ pub(crate) fn highlight_bash_to_lines(script: &str) -> Vec> { mod tests { use super::*; use pretty_assertions::assert_eq; + + #[cfg(not(target_os = "windows"))] use ratatui::style::Modifier; + #[cfg(not(target_os = "windows"))] fn reconstructed(lines: &[Line<'static>]) -> String { lines .iter() @@ -162,6 +171,7 @@ mod tests { .join("\n") } + #[cfg(not(target_os = "windows"))] fn dimmed_tokens(lines: &[Line<'static>]) -> Vec { lines .iter() @@ -173,6 +183,7 @@ mod tests { .collect() } + #[cfg(not(target_os = "windows"))] #[test] fn dims_expected_bash_operators() { let s = "echo foo && bar || baz | qux & (echo hi)"; @@ -185,6 +196,7 @@ mod tests { assert!(!dimmed.contains(&"echo".to_string())); } + #[cfg(not(target_os = "windows"))] #[test] fn dims_redirects_and_strings() { let s = "echo \"hi\" > out.txt; echo 'ok'"; @@ -197,6 +209,7 @@ mod tests { assert!(dimmed.contains(&"'ok'".to_string())); } + #[cfg(not(target_os = "windows"))] #[test] fn highlights_command_and_strings() { let s = "echo \"hi\""; @@ -219,6 +232,7 @@ mod tests { assert!(string_style.add_modifier.contains(Modifier::DIM)); } + #[cfg(not(target_os = "windows"))] #[test] fn highlights_heredoc_body_as_string() { let s = "cat <()) + .unwrap_or_default(); + assert!(reconstructed_first.contains("curl https://example.com")); + } }