Skip over some known divergence between implementations

pulldown-cmark · Jan 23, 2024 · 30bbeb4 · 30bbeb4
1 parent d3974b5
commit 30bbeb4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/fuzz/fuzz_targets/commonmark_js.rs b/fuzz/fuzz_targets/commonmark_js.rs
@@ -25,11 +25,6 @@ fuzz_target!(|text: String| {
         return;
     }
 
-    // https://github.com/raphlinus/pulldown-cmark/issues/659
-    if text.contains("<") {
-        return;
-    }
-
     // There are some trivial differences due to trailing whitespace.
     let text = text
         .lines()

diff --git a/fuzz/fuzz_targets/pandoc.rs b/fuzz/fuzz_targets/pandoc.rs
@@ -36,6 +36,18 @@ fuzz_target!(|text: String| {
     if text.contains("[^\r") {
         return;
     }
+    if text.contains(" ]") {
+        return;
+    }
+    if text.contains("\t]") {
+        return;
+    }
+    if text.contains("\n]") {
+        return;
+    }
+    if text.contains("\r]") {
+        return;
+    }
     if text.contains("[ ") {
         return;
     }
@@ -48,6 +60,12 @@ fuzz_target!(|text: String| {
     if text.contains("[\r") {
         return;
     }
+    if text.contains("`") {
+        return;
+    }
+    if text.contains(">>>>>") {
+        return;
+    }
 
     if text.bytes().any(|b| b > 127) {
         return;
@@ -83,7 +101,8 @@ fuzz_target!(|text: String| {
                 footstack.pop();
             }
             Event::FootnoteReference(id) => {
-                if footstack.contains(&id.trim().to_string()) {
+                if !footstack.is_empty() {
+                //if footstack.contains(&id.trim().to_string()) {
                     return;
                 }
             }

diff --git a/fuzz/src/lib.rs b/fuzz/src/lib.rs
@@ -24,7 +24,7 @@ pub fn pulldown_cmark(text: &str) -> Vec<Event<'_>> {
 /// Send Markdown `text` to `pulldown-cmark` and return Markdown
 /// events.
 pub fn pulldown_cmark_ext(text: &str) -> Vec<Event<'_>> {
-    Parser::new_ext(text, pulldown_cmark::Options::ENABLE_TABLES).collect()
+    Parser::new_ext(text, pulldown_cmark::Options::ENABLE_FOOTNOTES).collect()
 }
 
 pub struct PandocHandle {
@@ -85,7 +85,7 @@ impl PandocHandle {
         let PandocHandle { client, port, .. } = self;
         let request_json = serde_json::to_string(&PandocRequest {
             text,
-            from: "commonmark+pipe_tables",
+            from: "commonmark+footnotes",
             to: "json",
         })?;
         let res = client.post(&format!("http://localhost:{port}"))
@@ -871,10 +871,13 @@ pub fn normalize(events: Vec<Event<'_>>) -> Vec<Event<'_>> {
                 dest_url,
                 title,
                 id: _,
+                link_type,
                 ..
             }) => vec![Event::Start(Tag::Link {
                 link_type: LinkType::Inline,
-                dest_url: dest_url.clone(),
+                // pandoc and commonmark.js both turn <i@e> into <mailto:i@e> and don't
+                // distinguish between them
+                dest_url: format!("{e}{dest_url}", e = if link_type == LinkType::Email { "mailto:" } else { "" }).into(),
                 title: title.clone(),
                 // commonmark.js does not record the id, either
                 id: "".into(),
@@ -903,7 +906,7 @@ pub fn normalize(events: Vec<Event<'_>>) -> Vec<Event<'_>> {
             Event::Html(html) if html.is_empty() => vec![],
 
             // pulldown-cmark includes trailing newlines in HTML.
-            Event::Html(html) => vec![Event::Html(html.trim_end_matches('\n').to_string().into())],
+            Event::Html(html) => vec![Event::Html(html.trim().to_string().into())],
 
             event => vec![event],
         })