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

inline: mv autolink url from span to event field

Browse source
This commit is contained in:
Noah Hellman 2023-04-24 19:45:30 +02:00
parent 657b47df12
commit 0a144574f4
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/inline.rs
View file

@ -36,17 +36,14 @@ pub enum Container<'s> {
Strong,
Mark,
Verbatim,
RawFormat {
format: &'s str,
},
RawFormat { format: &'s str },
InlineMath,
DisplayMath,
ReferenceLink(CowStrIndex),
ReferenceImage(CowStrIndex),
InlineLink(CowStrIndex),
InlineImage(CowStrIndex),
/// Open delimiter span is URL, closing is '>'.
Autolink,
Autolink(&'s str),
}
type CowStrIndex = u32;
@ -577,12 +574,13 @@ impl<'s> Parser<'s> {
.sum();
if end && is_url {
self.input.lexer = lex::Lexer::new(ahead.as_str());
self.input.span = self.input.span.after(len);
self.push(EventKind::Enter(Autolink));
let span_url = self.input.span.after(len);
let url = span_url.of(self.input.src);
self.push(EventKind::Enter(Autolink(url)));
self.input.span = span_url;
self.push(EventKind::Str);
self.push(EventKind::Exit(Autolink));
self.input.span = self.input.span.after(1);
return Some(Continue);
return self.push(EventKind::Exit(Autolink(url)));
}
}
None
@ -1563,24 +1561,24 @@ mod test {
fn autolink() {
test_parse!(
"<https://example.com>",
(Enter(Autolink), "https://example.com"),
(Enter(Autolink("https://example.com",)), "<"),
(Str, "https://example.com"),
(Exit(Autolink), "https://example.com")
(Exit(Autolink("https://example.com",)), ">")
);
test_parse!(
"<a@b.c>",
(Enter(Autolink), "a@b.c"),
(Enter(Autolink("a@b.c")), "<"),
(Str, "a@b.c"),
(Exit(Autolink), "a@b.c"),
(Exit(Autolink("a@b.c")), ">"),
);
test_parse!(
"<http://a.b><http://c.d>",
(Enter(Autolink), "http://a.b"),
(Enter(Autolink("http://a.b")), "<"),
(Str, "http://a.b"),
(Exit(Autolink), "http://a.b"),
(Enter(Autolink), "http://c.d"),
(Exit(Autolink("http://a.b")), ">"),
(Enter(Autolink("http://c.d")), "<"),
(Str, "http://c.d"),
(Exit(Autolink), "http://c.d"),
(Exit(Autolink("http://c.d")), ">"),
);
test_parse!("<not-a-url>", (Str, "<not-a-url>"));
}

5
src/lib.rs
View file

@ -820,14 +820,13 @@ impl<'s> Parser<'s> {
Container::Image(url_or_tag, ty)
}
}
inline::Container::Autolink => {
let url: CowStr = inline.span.of(self.src).into();
inline::Container::Autolink(url) => {
let ty = if url.contains('@') {
LinkType::Email
} else {
LinkType::AutoLink
};
Container::Link(url, ty)
Container::Link(url.into(), ty)
}
};
if enter {