Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 39 additions & 19 deletions codex-rs/tui/src/bottom_pane/pending_input_preview.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ pub(crate) struct PendingInputPreview {
edit_binding: key_hint::KeyBinding,
}

const PREVIEW_LINE_LIMIT: usize = 3;

impl PendingInputPreview {
pub(crate) fn new() -> Self {
Self {
Expand All @@ -41,6 +43,18 @@ impl PendingInputPreview {
self.edit_binding = binding;
}

fn push_truncated_preview_lines(
lines: &mut Vec<Line<'static>>,
wrapped: Vec<Line<'static>>,
overflow_line: Line<'static>,
) {
let wrapped_len = wrapped.len();
lines.extend(wrapped.into_iter().take(PREVIEW_LINE_LIMIT));
if wrapped_len > PREVIEW_LINE_LIMIT {
lines.push(overflow_line);
}
}

fn as_renderable(&self, width: u16) -> Box<dyn Renderable> {
if (self.pending_steers.is_empty() && self.queued_messages.is_empty()) || width < 4 {
return Box::new(());
Expand All @@ -50,36 +64,26 @@ impl PendingInputPreview {

for steer in &self.pending_steers {
let wrapped = adaptive_wrap_lines(
steer
.lines()
.map(|line| format!("pending steer: {line}").dim()),
steer.lines().map(|line| Line::from(line.dim())),
RtOptions::new(width as usize)
.initial_indent(Line::from(" ! ".dim()))
.initial_indent(Line::from(" ! pending steer: ".dim()))
.subsequent_indent(Line::from(" ")),
);
let len = wrapped.len();
for line in wrapped.into_iter().take(3) {
lines.push(line);
}
if len > 3 {
lines.push(Line::from(" …".dim()));
}
Self::push_truncated_preview_lines(&mut lines, wrapped, Line::from(" …".dim()));
}

for message in &self.queued_messages {
let wrapped = adaptive_wrap_lines(
message.lines().map(|line| line.dim().italic()),
message.lines().map(|line| Line::from(line.dim().italic())),
RtOptions::new(width as usize)
.initial_indent(Line::from(" ↳ ".dim()))
.subsequent_indent(Line::from(" ")),
);
let len = wrapped.len();
for line in wrapped.into_iter().take(3) {
lines.push(line);
}
if len > 3 {
lines.push(Line::from(" …".dim().italic()));
}
Self::push_truncated_preview_lines(
&mut lines,
wrapped,
Line::from(" …".dim().italic()),
);
}

if !self.queued_messages.is_empty() {
Expand Down Expand Up @@ -266,4 +270,20 @@ mod tests {
format!("{buf:?}")
);
}

#[test]
fn render_multiline_pending_steer_uses_single_prefix_and_truncates() {
let mut queue = PendingInputPreview::new();
queue
.pending_steers
.push("First line\nSecond line\nThird line\nFourth line".to_string());
let width = 48;
let height = queue.desired_height(width);
let mut buf = Buffer::empty(Rect::new(0, 0, width, height));
queue.render(Rect::new(0, 0, width, height), &mut buf);
assert_snapshot!(
"render_multiline_pending_steer_uses_single_prefix_and_truncates",
format!("{buf:?}")
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
source: tui/src/bottom_pane/pending_input_preview.rs
expression: "format!(\"{buf:?}\")"
---
Buffer {
area: Rect { x: 0, y: 0, width: 48, height: 4 },
content: [
" ! pending steer: First line ",
" Second line ",
" Third line ",
" … ",
],
styles: [
x: 0, y: 0, fg: Reset, bg: Reset, underline: Reset, modifier: DIM,
x: 29, y: 0, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
x: 4, y: 1, fg: Reset, bg: Reset, underline: Reset, modifier: DIM,
x: 15, y: 1, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
x: 4, y: 2, fg: Reset, bg: Reset, underline: Reset, modifier: DIM,
x: 14, y: 2, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
x: 0, y: 3, fg: Reset, bg: Reset, underline: Reset, modifier: DIM,
x: 5, y: 3, fg: Reset, bg: Reset, underline: Reset, modifier: NONE,
]
}
Loading