2025-05-07 10:46:32 -07:00
|
|
|
use ratatui::text::Line;
|
2025-10-20 14:08:19 -07:00
|
|
|
pub(crate) fn append_markdown(
|
2025-05-16 11:33:08 -07:00
|
|
|
markdown_source: &str,
|
2025-09-30 16:13:55 -07:00
|
|
|
width: Option<usize>,
|
2025-05-16 11:33:08 -07:00
|
|
|
lines: &mut Vec<Line<'static>>,
|
|
|
|
|
) {
|
2025-10-20 14:08:19 -07:00
|
|
|
let rendered = crate::markdown_render::render_markdown_text_with_width(markdown_source, width);
|
2025-09-10 12:13:53 -07:00
|
|
|
crate::render::line_utils::push_owned_lines(&rendered.lines, lines);
|
2025-08-12 17:37:28 -07:00
|
|
|
}
|
|
|
|
|
|
2025-05-16 11:33:08 -07:00
|
|
|
#[cfg(test)]
|
|
|
|
|
mod tests {
|
|
|
|
|
use super::*;
|
|
|
|
|
use pretty_assertions::assert_eq;
|
2025-10-20 14:08:19 -07:00
|
|
|
use ratatui::text::Line;
|
2025-05-16 11:33:08 -07:00
|
|
|
|
2025-10-20 14:08:19 -07:00
|
|
|
fn lines_to_strings(lines: &[Line<'static>]) -> Vec<String> {
|
|
|
|
|
lines
|
2025-08-12 17:37:28 -07:00
|
|
|
.iter()
|
|
|
|
|
.map(|l| {
|
|
|
|
|
l.spans
|
|
|
|
|
.iter()
|
|
|
|
|
.map(|s| s.content.clone())
|
|
|
|
|
.collect::<String>()
|
|
|
|
|
})
|
2025-10-20 14:08:19 -07:00
|
|
|
.collect()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn citations_render_as_plain_text() {
|
|
|
|
|
let src = "Before 【F:/x.rs†L1】\nAfter 【F:/x.rs†L3】\n";
|
|
|
|
|
let mut out = Vec::new();
|
|
|
|
|
append_markdown(src, None, &mut out);
|
|
|
|
|
let rendered = lines_to_strings(&out);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
rendered,
|
|
|
|
|
vec![
|
|
|
|
|
"Before 【F:/x.rs†L1】".to_string(),
|
|
|
|
|
"After 【F:/x.rs†L3】".to_string()
|
|
|
|
|
]
|
2025-09-10 12:13:53 -07:00
|
|
|
);
|
2025-08-12 17:37:28 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn indented_code_blocks_preserve_leading_whitespace() {
|
2025-09-10 12:13:53 -07:00
|
|
|
// Basic sanity: indented code with surrounding blank lines should produce the indented line.
|
|
|
|
|
let src = "Before\n\n code 1\n\nAfter\n";
|
2025-08-12 17:37:28 -07:00
|
|
|
let mut out = Vec::new();
|
2025-10-20 14:08:19 -07:00
|
|
|
append_markdown(src, None, &mut out);
|
|
|
|
|
let lines = lines_to_strings(&out);
|
2025-09-10 12:13:53 -07:00
|
|
|
assert_eq!(lines, vec!["Before", "", " code 1", "", "After"]);
|
2025-08-12 17:37:28 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn append_markdown_preserves_full_text_line() {
|
|
|
|
|
let src = "Hi! How can I help with codex-rs today? Want me to explore the repo, run tests, or work on a specific change?\n";
|
|
|
|
|
let mut out = Vec::new();
|
2025-10-20 14:08:19 -07:00
|
|
|
append_markdown(src, None, &mut out);
|
2025-08-12 17:37:28 -07:00
|
|
|
assert_eq!(
|
|
|
|
|
out.len(),
|
|
|
|
|
1,
|
|
|
|
|
"expected a single rendered line for plain text"
|
|
|
|
|
);
|
|
|
|
|
let rendered: String = out
|
|
|
|
|
.iter()
|
|
|
|
|
.flat_map(|l| l.spans.iter())
|
|
|
|
|
.map(|s| s.content.clone())
|
|
|
|
|
.collect::<Vec<_>>()
|
|
|
|
|
.join("");
|
|
|
|
|
assert_eq!(
|
|
|
|
|
rendered,
|
|
|
|
|
"Hi! How can I help with codex-rs today? Want me to explore the repo, run tests, or work on a specific change?"
|
|
|
|
|
);
|
|
|
|
|
}
|
2025-08-27 13:55:59 -07:00
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn append_markdown_matches_tui_markdown_for_ordered_item() {
|
|
|
|
|
let mut out = Vec::new();
|
2025-10-20 14:08:19 -07:00
|
|
|
append_markdown("1. Tight item\n", None, &mut out);
|
|
|
|
|
let lines = lines_to_strings(&out);
|
2025-08-27 13:55:59 -07:00
|
|
|
assert_eq!(lines, vec!["1. Tight item".to_string()]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn append_markdown_keeps_ordered_list_line_unsplit_in_context() {
|
|
|
|
|
let src = "Loose vs. tight list items:\n1. Tight item\n";
|
|
|
|
|
let mut out = Vec::new();
|
2025-10-20 14:08:19 -07:00
|
|
|
append_markdown(src, None, &mut out);
|
2025-08-27 13:55:59 -07:00
|
|
|
|
2025-10-20 14:08:19 -07:00
|
|
|
let lines = lines_to_strings(&out);
|
2025-08-27 13:55:59 -07:00
|
|
|
|
|
|
|
|
// Expect to find the ordered list line rendered as a single line,
|
|
|
|
|
// not split into a marker-only line followed by the text.
|
|
|
|
|
assert!(
|
|
|
|
|
lines.iter().any(|s| s == "1. Tight item"),
|
|
|
|
|
"expected '1. Tight item' rendered as a single line; got: {lines:?}"
|
|
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
!lines
|
|
|
|
|
.windows(2)
|
|
|
|
|
.any(|w| w[0].trim_end() == "1." && w[1] == "Tight item"),
|
|
|
|
|
"did not expect a split into ['1.', 'Tight item']; got: {lines:?}"
|
|
|
|
|
);
|
|
|
|
|
}
|
2025-05-16 11:33:08 -07:00
|
|
|
}
|