## What? Fixed error handling in `insert_history_lines_to_writer` where all terminal operations were silently ignoring errors via `.ok()`. ## Why? Silent I/O failures could leave the terminal in an inconsistent state (e.g., scroll region not reset) with no way to debug. This violates Rust error handling best practices. ## How? - Changed function signature to return `io::Result<()>` - Replaced all `.ok()` calls with `?` operator to propagate errors - Added `tracing::warn!` in wrapper function for backward compatibility - Updated 15 test call sites to handle Result with `.expect()` ## Testing - ✅ Pass all tests ## Type of Change - [x] Bug fix (non-breaking change) --------- Signed-off-by: Huaiwu Li <lhwzds@gmail.com> Co-authored-by: Eric Traut <etraut@openai.com>
154 lines
4.8 KiB
Rust
154 lines
4.8 KiB
Rust
#![cfg(feature = "vt100-tests")]
|
||
#![expect(clippy::expect_used)]
|
||
|
||
use crate::test_backend::VT100Backend;
|
||
use ratatui::layout::Rect;
|
||
use ratatui::style::Stylize;
|
||
use ratatui::text::Line;
|
||
|
||
// Small helper macro to assert a collection contains an item with a clearer
|
||
// failure message.
|
||
macro_rules! assert_contains {
|
||
($collection:expr, $item:expr $(,)?) => {
|
||
assert!(
|
||
$collection.contains(&$item),
|
||
"Expected {:?} to contain {:?}",
|
||
$collection,
|
||
$item
|
||
);
|
||
};
|
||
($collection:expr, $item:expr, $($arg:tt)+) => {
|
||
assert!($collection.contains(&$item), $($arg)+);
|
||
};
|
||
}
|
||
|
||
struct TestScenario {
|
||
term: codex_tui::custom_terminal::Terminal<VT100Backend>,
|
||
}
|
||
|
||
impl TestScenario {
|
||
fn new(width: u16, height: u16, viewport: Rect) -> Self {
|
||
let backend = VT100Backend::new(width, height);
|
||
let mut term = codex_tui::custom_terminal::Terminal::with_options(backend)
|
||
.expect("failed to construct terminal");
|
||
term.set_viewport_area(viewport);
|
||
Self { term }
|
||
}
|
||
|
||
fn run_insert(&mut self, lines: Vec<Line<'static>>) {
|
||
codex_tui::insert_history::insert_history_lines(&mut self.term, lines)
|
||
.expect("Failed to insert history lines in test");
|
||
}
|
||
}
|
||
|
||
#[test]
|
||
fn basic_insertion_no_wrap() {
|
||
// Screen of 20x6; viewport is the last row (height=1 at y=5)
|
||
let area = Rect::new(0, 5, 20, 1);
|
||
let mut scenario = TestScenario::new(20, 6, area);
|
||
|
||
let lines = vec!["first".into(), "second".into()];
|
||
scenario.run_insert(lines);
|
||
let rows = scenario.term.backend().vt100().screen().contents();
|
||
assert_contains!(rows, String::from("first"));
|
||
assert_contains!(rows, String::from("second"));
|
||
}
|
||
|
||
#[test]
|
||
fn long_token_wraps() {
|
||
let area = Rect::new(0, 5, 20, 1);
|
||
let mut scenario = TestScenario::new(20, 6, area);
|
||
|
||
let long = "A".repeat(45); // > 2 lines at width 20
|
||
let lines = vec![long.clone().into()];
|
||
scenario.run_insert(lines);
|
||
let screen = scenario.term.backend().vt100().screen();
|
||
|
||
// Count total A's on the screen
|
||
let mut count_a = 0usize;
|
||
for row in 0..6 {
|
||
for col in 0..20 {
|
||
if let Some(cell) = screen.cell(row, col)
|
||
&& let Some(ch) = cell.contents().chars().next()
|
||
&& ch == 'A'
|
||
{
|
||
count_a += 1;
|
||
}
|
||
}
|
||
}
|
||
|
||
assert_eq!(
|
||
count_a,
|
||
long.len(),
|
||
"wrapped content did not preserve all characters"
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn emoji_and_cjk() {
|
||
let area = Rect::new(0, 5, 20, 1);
|
||
let mut scenario = TestScenario::new(20, 6, area);
|
||
|
||
let text = String::from("😀😀😀😀😀 你好世界");
|
||
let lines = vec![text.clone().into()];
|
||
scenario.run_insert(lines);
|
||
let rows = scenario.term.backend().vt100().screen().contents();
|
||
for ch in text.chars().filter(|c| !c.is_whitespace()) {
|
||
assert!(
|
||
rows.contains(ch),
|
||
"missing character {ch:?} in reconstructed screen"
|
||
);
|
||
}
|
||
}
|
||
|
||
#[test]
|
||
fn mixed_ansi_spans() {
|
||
let area = Rect::new(0, 5, 20, 1);
|
||
let mut scenario = TestScenario::new(20, 6, area);
|
||
|
||
let line = vec!["red".red(), "+plain".into()].into();
|
||
scenario.run_insert(vec![line]);
|
||
let rows = scenario.term.backend().vt100().screen().contents();
|
||
assert_contains!(rows, String::from("red+plain"));
|
||
}
|
||
|
||
#[test]
|
||
fn cursor_restoration() {
|
||
let area = Rect::new(0, 5, 20, 1);
|
||
let mut scenario = TestScenario::new(20, 6, area);
|
||
|
||
let lines = vec!["x".into()];
|
||
scenario.run_insert(lines);
|
||
assert_eq!(scenario.term.last_known_cursor_pos, (0, 0).into());
|
||
}
|
||
|
||
#[test]
|
||
fn word_wrap_no_mid_word_split() {
|
||
// Screen of 40x10; viewport is the last row
|
||
let area = Rect::new(0, 9, 40, 1);
|
||
let mut scenario = TestScenario::new(40, 10, area);
|
||
|
||
let sample = "Years passed, and Willowmere thrived in peace and friendship. Mira’s herb garden flourished with both ordinary and enchanted plants, and travelers spoke of the kindness of the woman who tended them.";
|
||
scenario.run_insert(vec![sample.into()]);
|
||
let joined = scenario.term.backend().vt100().screen().contents();
|
||
assert!(
|
||
!joined.contains("bo\nth"),
|
||
"word 'both' should not be split across lines:\n{joined}"
|
||
);
|
||
}
|
||
|
||
#[test]
|
||
fn em_dash_and_space_word_wrap() {
|
||
// Repro from report: ensure we break before "inside", not mid-word.
|
||
let area = Rect::new(0, 9, 40, 1);
|
||
let mut scenario = TestScenario::new(40, 10, area);
|
||
|
||
let sample = "Mara found an old key on the shore. Curious, she opened a tarnished box half-buried in sand—and inside lay a single, glowing seed.";
|
||
scenario.run_insert(vec![sample.into()]);
|
||
let joined = scenario.term.backend().vt100().screen().contents();
|
||
assert!(
|
||
!joined.contains("insi\nde"),
|
||
"word 'inside' should not be split across lines:\n{joined}"
|
||
);
|
||
}
|