Update pulldown-cmark

gyscos · Mar 27, 2024 · 0a95c82 · 0a95c82
1 parent c4ff7d1
commit 0a95c82
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/cursive-core/Cargo.toml b/cursive-core/Cargo.toml
@@ -62,7 +62,7 @@ version = "0.4"
 [dependencies.pulldown-cmark]
 default-features = false
 optional = true
-version = "0.9"
+version = "0.10"
 
 [features]
 default = []

diff --git a/cursive-core/src/utils/markup/markdown.rs b/cursive-core/src/utils/markup/markdown.rs
@@ -10,7 +10,7 @@ use crate::theme::{Effect, Style};
 use crate::utils::markup::{StyledIndexedSpan, StyledString};
 use crate::utils::span::IndexedCow;
 
-use pulldown_cmark::{self, CowStr, Event, Tag};
+use pulldown_cmark::{self, CowStr, Event, Tag, TagEnd};
 use unicode_width::UnicodeWidthStr;
 
 /// Parses the given string as markdown text.
@@ -30,7 +30,7 @@ pub struct Parser<'a> {
     first: bool,
     stack: Vec<Style>,
     input: &'a str,
-    parser: pulldown_cmark::Parser<'a, 'a>,
+    parser: pulldown_cmark::Parser<'a>,
 }
 
 impl<'a> Parser<'a> {
@@ -71,23 +71,24 @@ impl<'a> Iterator for Parser<'a> {
                 Event::Start(tag) => match tag {
                     // Add to the stack!
                     Tag::Emphasis => self.stack.push(Style::from(Effect::Italic)),
-                    Tag::Heading(level, ..) => {
+                    Tag::Heading { level, .. } => {
                         return Some(self.literal(format!("{} ", heading(level as usize))))
                     }
                     Tag::BlockQuote => return Some(self.literal("> ")),
-                    Tag::Link(_, _, _) => return Some(self.literal("[")),
+                    Tag::Link {
+                        dest_url, title, ..
+                    } => return Some(self.literal(format!("[{title}]({dest_url})"))),
                     Tag::CodeBlock(_) => return Some(self.literal("```")),
                     Tag::Strong => self.stack.push(Style::from(Effect::Bold)),
                     Tag::Paragraph if !self.first => return Some(self.literal("\n\n")),
                     _ => (),
                 },
                 Event::End(tag) => match tag {
                     // Remove from stack!
-                    Tag::Paragraph if self.first => self.first = false,
-                    Tag::Heading(..) => return Some(self.literal("\n\n")),
-                    Tag::Link(_, link, _) => return Some(self.literal(format!("]({link})"))),
-                    Tag::CodeBlock(_) => return Some(self.literal("```")),
-                    Tag::Emphasis | Tag::Strong => {
+                    TagEnd::Paragraph if self.first => self.first = false,
+                    TagEnd::Heading(..) => return Some(self.literal("\n\n")),
+                    TagEnd::CodeBlock => return Some(self.literal("```")),
+                    TagEnd::Emphasis | TagEnd::Strong => {
                         self.stack.pop().unwrap();
                     }
                     _ => (),
@@ -97,6 +98,7 @@ impl<'a> Iterator for Parser<'a> {
                 Event::HardBreak => return Some(self.literal("\n")),
                 // Treat all text the same
                 Event::FootnoteReference(text)
+                | Event::InlineHtml(text)
                 | Event::Html(text)
                 | Event::Text(text)
                 | Event::Code(text) => {