caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix that incremental reparsing is impossible at the end

Browse Source 
Co-Authored-By: Martin Haug <mhaug@live.de>
This commit is contained in:
Laurenz 2022-06-01 10:30:28 +02:00
parent 0a9172cb15
commit c56a8c41f0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/parse/incremental.rs
View File

@ -68,6 +68,7 @@ impl Reparser<'_> {
for (i, child) in node.children().enumerate() { for (i, child) in node.children().enumerate() {
let pos = NodePos { idx: i, offset }; let pos = NodePos { idx: i, offset };
let child_span = offset .. offset + child.len(); let child_span = offset .. offset + child.len();
child_outermost = outermost && i + 1 == original_count;
match search { match search {
SearchState::NoneFound => { SearchState::NoneFound => {
@ -84,6 +85,11 @@ impl Reparser<'_> {
}; };
} else if child_span.contains(&self.replaced.start) { } else if child_span.contains(&self.replaced.start) {
search = SearchState::Inside(pos); search = SearchState::Inside(pos);
} else if child_span.end == self.replaced.start
&& self.replaced.start == self.replaced.end
&& child_outermost
{
search = SearchState::SpanFound(pos, pos);
} else { } else {
// We look only for non spaces, non-semicolon and also // We look only for non spaces, non-semicolon and also
// reject text that points to the special case for URL // reject text that points to the special case for URL
@ -115,7 +121,6 @@ impl Reparser<'_> {
} }
offset += child.len(); offset += child.len();
child_outermost = outermost && i + 1 == original_count;
if search.done().is_some() { if search.done().is_some() {
break; break;
@ -346,7 +351,7 @@ mod tests {
test("a\nb\nc *hel a b lo* d\nd\ne", 13..13, "c ", 6..20); test("a\nb\nc *hel a b lo* d\nd\ne", 13..13, "c ", 6..20);
test("~~ {a} ~~", 4 .. 5, "b", 3 .. 6); test("~~ {a} ~~", 4 .. 5, "b", 3 .. 6);
test("{(0, 1, 2)}", 5 .. 6, "11pt", 0..14); test("{(0, 1, 2)}", 5 .. 6, "11pt", 0..14);
test("\n= A heading", 3 .. 3, "n evocative", 3 .. 23); test("\n= A heading", 4 .. 4, "n evocative", 3 .. 23);
test("for~your~thing", 9 .. 9, "a", 4 .. 15); test("for~your~thing", 9 .. 9, "a", 4 .. 15);
test("a your thing a", 6 .. 7, "a", 0 .. 14); test("a your thing a", 6 .. 7, "a", 0 .. 14);
test("{call(); abc}", 7 .. 7, "[]", 0 .. 15); test("{call(); abc}", 7 .. 7, "[]", 0 .. 15);

2
src/parse/mod.rs
View File

@ -107,7 +107,7 @@ fn reparse_markup_elements(
markup_node(&mut p, &mut at_start); markup_node(&mut p, &mut at_start);
if p.prev_end() < end_pos { if p.prev_end() <= end_pos {
continue; continue;
} }