documents: drawn text reads back from its end, decoded as written
Each piece records how its source decodes: Markdown's escapes and references for text, HTML's for an HTML block's runs, none for code spans, cut as CommonMark cuts their end spaces. Matching runs from the piece's end, so quote marks and indents at a line's start are never taken for text, and an alert's text needs no moved position: alert() takes no source again. Lines split on LF, CRLF and CR alike; LineMap matches each drawn line to the written line it ends once, so an HTML block maps in linear time and a tab cut to spaces lands on the tab. A write-back refuses the press when the pressed block's kind, text or drawing changed. The hostile HTML test measures growth: a fixed 2 s budget failed under the full suite's load on the old code too. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
83d747d87e
commit
d4c614cb7f
10 files changed
+536
-221
No files matched your search
@@ -0,0 +1,123 @@
|
||||
//! Drawn text reads back to its source byte (R4.5).
|
||||
|
||||
use crate::documents::{
|
||||
TargetBlock,
|
||||
document::parse::parsed,
|
||||
tree::{Inline, Node, lines_at},
|
||||
};
|
||||
|
||||
/// The source byte under drawn `shown` in block 0.
|
||||
fn read_back(source: &str, shown: &str) -> Option<usize> {
|
||||
fn find<'a>(nodes: &'a [Node], shown: &str) -> Option<&'a Inline> {
|
||||
nodes.iter().find_map(|node| match node {
|
||||
Node::Paragraph(inline) | Node::Heading(_, inline) if inline.text.contains(shown) => {
|
||||
Some(inline)
|
||||
}
|
||||
Node::Quote(body) | Node::Alert { body, .. } | Node::Footnote { body, .. } => {
|
||||
find(body, shown)
|
||||
}
|
||||
_ => None,
|
||||
})
|
||||
}
|
||||
let parsed = parsed(source);
|
||||
let block = &parsed.blocks[0];
|
||||
let inline = find(block.nodes.as_ref().expect("drawn"), shown).expect("shown");
|
||||
let at = inline.text.find(shown).expect("shown");
|
||||
let written = inline.source_at(&source[block.range.start..], at)?;
|
||||
Some(block.range.start + written)
|
||||
}
|
||||
|
||||
/// The source byte under drawn `word` of block 0's code.
|
||||
fn code_back(source: &str, word: &str) -> Option<usize> {
|
||||
fn code(nodes: &[Node]) -> (&str, usize) {
|
||||
match &nodes[0] {
|
||||
Node::Code { text, from, .. } => (text, *from),
|
||||
Node::Quote(body) => code(body),
|
||||
other => panic!("not code: {other:?}"),
|
||||
}
|
||||
}
|
||||
let parsed = parsed(source);
|
||||
let block = &parsed.blocks[0];
|
||||
let (drawn, from) = code(block.nodes.as_ref().expect("drawn"));
|
||||
let at = drawn.find(word).expect("drawn");
|
||||
let written = lines_at(&source[block.range.start..], from, drawn, at)?;
|
||||
Some(block.range.start + written)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn text_reads_back_past_marks_escapes_trims_and_markers() {
|
||||
let cases = [
|
||||
("> alpha\n> beta", "eta"),
|
||||
("> [!NOTE]\n> alpha beta", "beta"),
|
||||
("> [!NOTE] \n> alpha beta", "beta"),
|
||||
("> [!NOTE]\\\n> alpha beta", "beta"),
|
||||
("> [!NOTE]\n> \\*beta\\*", "*beta"),
|
||||
("> [!NOTE] alpha beta", "beta"),
|
||||
("a \\*star\\* z", "*star"),
|
||||
("a \\\\ z", "\\ z"),
|
||||
("a ` xy ` z", "xy"),
|
||||
("a ` xy ` z", " xy "),
|
||||
("a ` >xy ` z", ">xy"),
|
||||
("a `\\\\xy` z", "xy"),
|
||||
("<div>alpha beta</div>\n", "eta"),
|
||||
("> <div>\n> alpha beta</div>\n", "beta"),
|
||||
("> <div>\n> >alpha beta</div>", ">alpha"),
|
||||
("> <div>\n> >alpha beta</div>", "beta"),
|
||||
("<div>alpha <b>beta</b> gamma</div>", "gamma"),
|
||||
("<div>alpha <b>beta</b> gamma</div>", "beta"),
|
||||
("<div>alpha <b> beta</b></div>", "eta"),
|
||||
("<div>one</div>\n<div>alpha beta</div>", "beta"),
|
||||
];
|
||||
for (source, shown) in cases {
|
||||
assert_eq!(read_back(source, shown), source.find(shown), "{source:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_reference_reads_back_to_its_ampersand() {
|
||||
let source = "a & b";
|
||||
assert_eq!(read_back(source, "& b"), source.find('&'));
|
||||
assert_eq!(read_back(source, "b"), source.find('b'));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn text_after_an_emoji_reads_back_and_before_it_lands_at_its_start() {
|
||||
let source = "ab :smile: y";
|
||||
assert_eq!(read_back(source, "y"), source.find('y'));
|
||||
assert_eq!(read_back(source, "b"), Some(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn code_reads_back_line_for_line_whatever_its_line_ends() {
|
||||
let cases = [
|
||||
"```\nalpha\nbeta\n```\n",
|
||||
"```\r\nalpha\r\nbeta\r\n```\r\n",
|
||||
"```\ralpha\rbeta\r```\r",
|
||||
" alpha\n beta\n",
|
||||
"> ```\n> alpha\n> beta\n> ```\n",
|
||||
];
|
||||
for source in cases {
|
||||
for word in ["pha", "eta"] {
|
||||
assert_eq!(code_back(source, word), source.find(word), "{source:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn code_cut_from_a_tab_reads_back_past_it() {
|
||||
for spaces in 0..=3 {
|
||||
for prefix in ["\t", " \t", " \t", " \t", "\t\t"] {
|
||||
let indent = " ".repeat(spaces);
|
||||
let source = format!("{indent}```\n{indent}alpha\n{prefix}beta\n{indent}```\n");
|
||||
assert_eq!(code_back(&source, "eta"), source.find("eta"), "{source:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_decoded_line_end_reads_without_a_written_one() {
|
||||
let quote = parsed("> alpha beta");
|
||||
assert_eq!(quote.blocks[0].kind, TargetBlock::Quote);
|
||||
let alert = parsed("> [!NOTE] alpha beta");
|
||||
assert_eq!(alert.blocks[0].kind, TargetBlock::Alert);
|
||||
}
|
||||
Reference in new issue
Block a user