Skip to content

upgrade pulldown-cmark to 0.13 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexanderkjall wants to merge 1 commit into
base: main
Choose a base branch
from
Open

upgrade pulldown-cmark to 0.13 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ lazy_static = "1.4"
log = "0.4.22"
minimad = "0.13.1"
percent-encoding = "2.1"
pulldown-cmark = { version = "0.9.6", default-features = false }
pulldown-cmark = { version = "0.13", default-features = false }
rayon = "1.5"
reqwest = { version = "0.12.7", features = ["gzip", "json"] }
scraper = "0.20.0"
Expand Down
37 changes: 20 additions & 17 deletions src/tui/markdown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use cursive::theme::{Effect, PaletteColor, Style};
use cursive::utils::markup::{StyledIndexedSpan, StyledString};
use cursive::utils::span::{IndexedCow, IndexedSpan};
use pulldown_cmark::{self, CowStr, Event, HeadingLevel, Options, Tag};
use pulldown_cmark::{self, CowStr, Event, HeadingLevel, Options, Tag, TagEnd};

pub type Markdown = StyledString;

Expand Down Expand Up @@ -79,16 +79,16 @@ fn parse_spans(input: &str) -> Vec<StyledIndexedSpan> {
}

/// Iterator that parse a markdown text and outputs styled spans.
pub struct Parser<'a, 'b> {
pub struct Parser<'a> {
first: bool,
item: Option<u64>,
in_list: bool,
after_code_block: bool,
stack: Vec<Style>,
parser: pulldown_cmark::Parser<'a, 'b>,
parser: pulldown_cmark::Parser<'a>,
}

impl<'a> Parser<'a, '_> {
impl<'a> Parser<'a> {
/// Creates a new parser with the given input text.
pub fn new(input: &'a str) -> Self {
let mut opts = pulldown_cmark::Options::empty();
Expand Down Expand Up @@ -127,7 +127,7 @@ impl<'a> Parser<'a, '_> {
}
}

impl<'a, 'b> Iterator for Parser<'a, 'b> {
impl<'a> Iterator for Parser<'a> {
type Item = StyledIndexedSpan;

fn next(&mut self) -> Option<Self::Item> {
Expand All @@ -141,13 +141,13 @@ impl<'a, 'b> Iterator for Parser<'a, 'b> {
// Add styles to the stack
Event::Start(tag) => match tag {
Tag::Emphasis => self.stack.push(Style::from(Effect::Italic)),
Tag::Heading(HeadingLevel::H1, _, _) => {
Tag::Heading { level: HeadingLevel::H1, .. } => {
self.stack.push(Style::from(PaletteColor::TitlePrimary))
}
Tag::Heading(..) => self.stack.push(Style::from(PaletteColor::TitleSecondary)),
Tag::Heading { .. } => self.stack.push(Style::from(PaletteColor::TitleSecondary)),
// TODO style quote?
Tag::BlockQuote => return Some(self.literal("> ")),
Tag::Link(_, _, _) => return Some(self.literal("[")),
Tag::BlockQuote(_) => return Some(self.literal("> ")),
Tag::Link { .. } => return Some(self.literal("[")),
Tag::CodeBlock(_) => {
self.stack.push(Style::from(PaletteColor::Secondary));
}
Expand All @@ -172,28 +172,28 @@ impl<'a, 'b> Iterator for Parser<'a, 'b> {
},
// Remove styles from stack
Event::End(tag) => match tag {
Tag::Paragraph => return Some(self.literal("\n\n")),
Tag::Heading(..) => {
TagEnd::Paragraph => return Some(self.literal("\n\n")),
TagEnd::Heading(_) => {
self.stack.pop().unwrap();
return Some(self.literal("\n\n"));
}
// TODO underline the link?
Tag::Link(_, link, _) => return Some(self.literal(format!("]({link})"))),
Tag::CodeBlock(_) => {
TagEnd::Link => return Some(self.literal("](link)")),
TagEnd::CodeBlock => {
self.after_code_block = true;
self.stack.pop().unwrap();
return Some(self.literal("\n"));
}
Tag::Emphasis | Tag::Strong => {
TagEnd::Emphasis | TagEnd::Strong => {
self.stack.pop().unwrap();
}
Tag::List(_) => {
TagEnd::List(_) => {
self.item = None;
self.in_list = false;
self.first = false;
return Some(self.literal("\n"));
}
Tag::Item => {
TagEnd::Item => {
self.item = self.item.map(|ix| ix + 1);
return Some(self.literal("\n"));
}
Expand All @@ -209,7 +209,10 @@ impl<'a, 'b> Iterator for Parser<'a, 'b> {
);
}
// Treat all other texts the same
Event::FootnoteReference(text) | Event::Html(text) | Event::Text(text) => {
Event::FootnoteReference(text) | Event::Html(text) | Event::Text(text) | Event::InlineHtml(text) => {
return Some(self.cowstr_to_span(text, None));
}
Event::InlineMath(text) | Event::DisplayMath(text) => {
return Some(self.cowstr_to_span(text, None));
}
Event::TaskListMarker(checked) => {
Expand Down