fnmain/jotdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inline: include attribute in end event span

Browse source
This commit is contained in:
Noah Hellman 2023-05-11 19:15:52 +02:00
parent 42ce9a3670
commit f5c87f32f9
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/inline.rs
View file

@ -524,7 +524,13 @@ impl<'s> Parser<'s> {
self.input.span = Span::new(start_attr, state.end_attr); self.input.span = Span::new(start_attr, state.end_attr);
self.input.lexer = lex::Lexer::new(&self.input.src[state.end_attr..line_end]); self.input.lexer = lex::Lexer::new(&self.input.src[state.end_attr..line_end]);
if !attrs.is_empty() { if attrs.is_empty() {
if matches!(state.elem_ty, AttributesElementType::Container { .. }) {
let last = self.events.len() - 1;
self.events[last].span =
Span::new(self.events[last].span.start(), self.input.span.end());
}
} else {
let attr_index = self.store_attributes.len() as AttributesIndex; let attr_index = self.store_attributes.len() as AttributesIndex;
self.store_attributes.push(attrs); self.store_attributes.push(attrs);
let attr_event = Event { let attr_event = Event {
@ -537,11 +543,13 @@ impl<'s> Parser<'s> {
match state.elem_ty { match state.elem_ty {
AttributesElementType::Container { e_placeholder } => { AttributesElementType::Container { e_placeholder } => {
self.events[e_placeholder] = attr_event; self.events[e_placeholder] = attr_event;
let last = self.events.len() - 1;
if matches!(self.events[e_placeholder + 1].kind, EventKind::Str) { if matches!(self.events[e_placeholder + 1].kind, EventKind::Str) {
self.events[e_placeholder + 1].kind = EventKind::Enter(Span); self.events[e_placeholder + 1].kind = EventKind::Enter(Span);
let last = self.events.len() - 1;
self.events[last].kind = EventKind::Exit(Span); self.events[last].kind = EventKind::Exit(Span);
} }
self.events[last].span =
Span::new(self.events[last].span.start(), self.input.span.end());
} }
AttributesElementType::Word => { AttributesElementType::Word => {
self.events.push_back(attr_event); self.events.push_back(attr_event);
@ -971,7 +979,7 @@ impl<'s> Parser<'s> {
let attr = self.events.pop_front().unwrap(); let attr = self.events.pop_front().unwrap();
self.events.push_front(Event { self.events.push_front(Event {
kind: EventKind::Exit(Span), kind: EventKind::Exit(Span),
span: span_str.empty_after(), span: attr.span,
}); });
self.events.push_front(Event { self.events.push_front(Event {
kind: EventKind::Str, kind: EventKind::Str,
@ -1265,7 +1273,7 @@ mod test {
), ),
(Enter(Verbatim), "`"), (Enter(Verbatim), "`"),
(Str, "raw"), (Str, "raw"),
(Exit(Verbatim), "`"), (Exit(Verbatim), "`{#id}"),
(Str, " post"), (Str, " post"),
); );
} }
@ -1455,7 +1463,7 @@ mod test {
), ),
(Enter(Span), ""), (Enter(Span), ""),
(Str, "[text]("), (Str, "[text]("),
(Exit(Span), ""), (Exit(Span), "{.cls}"),
); );
} }
@ -1519,7 +1527,7 @@ mod test {
"{.cls}", "{.cls}",
), ),
(Enter(Span), "["), (Enter(Span), "["),
(Exit(Span), "]") (Exit(Span), "]{.cls}")
); );
} }
@ -1536,7 +1544,7 @@ mod test {
), ),
(Enter(Span), "["), (Enter(Span), "["),
(Str, "abc"), (Str, "abc"),
(Exit(Span), "]"), (Exit(Span), "]{.def}"),
); );
test_parse!("not a [span] {#id}.", (Str, "not a [span] "), (Str, ".")); test_parse!("not a [span] {#id}.", (Str, "not a [span] "), (Str, "."));
} }
@ -1554,7 +1562,7 @@ mod test {
), ),
(Enter(Span), "["), (Enter(Span), "["),
(Str, "x_y"), (Str, "x_y"),
(Exit(Span), "]"), (Exit(Span), "]{.bar_}"),
); );
} }
@ -1686,7 +1694,7 @@ mod test {
), ),
(Enter(Emphasis), "_"), (Enter(Emphasis), "_"),
(Str, "abc def"), (Str, "abc def"),
(Exit(Emphasis), "_"), (Exit(Emphasis), "_{.attr}"),
); );
} }
@ -1696,13 +1704,13 @@ mod test {
"_abc def_{}", "_abc def_{}",
(Enter(Emphasis), "_"), (Enter(Emphasis), "_"),
(Str, "abc def"), (Str, "abc def"),
(Exit(Emphasis), "_"), (Exit(Emphasis), "_{}"),
); );
test_parse!( test_parse!(
"_abc def_{ % comment % } ghi", "_abc def_{ % comment % } ghi",
(Enter(Emphasis), "_"), (Enter(Emphasis), "_"),
(Str, "abc def"), (Str, "abc def"),
(Exit(Emphasis), "_"), (Exit(Emphasis), "_{ % comment % }"),
(Str, " ghi"), (Str, " ghi"),
); );
} }
@ -1720,7 +1728,7 @@ mod test {
), ),
(Enter(Emphasis), "_"), (Enter(Emphasis), "_"),
(Str, "abc def"), (Str, "abc def"),
(Exit(Emphasis), "_"), (Exit(Emphasis), "_{.a}{.b}{.c}"),
(Str, " "), (Str, " "),
); );
} }
@ -1738,7 +1746,7 @@ mod test {
), ),
(Enter(Span), ""), (Enter(Span), ""),
(Str, "word"), (Str, "word"),
(Exit(Span), ""), (Exit(Span), "{a=b}"),
); );
test_parse!( test_parse!(
"some word{.a}{.b} with attrs", "some word{.a}{.b} with attrs",
@ -1752,7 +1760,7 @@ mod test {
), ),
(Enter(Span), ""), (Enter(Span), ""),
(Str, "word"), (Str, "word"),
(Exit(Span), ""), (Exit(Span), "{.a}{.b}"),
(Str, " with attrs"), (Str, " with attrs"),
); );
} }