From 6b53695be67bcdbca3b4e3677ea9909033440898 Mon Sep 17 00:00:00 2001
From: Matthias Endler <matthias@endler.dev>
Date: Thu, 7 Nov 2024 14:54:42 +0100
Subject: [PATCH] Support underscores in Markdown URLs (#1555)

---
 lychee-lib/src/extract/markdown.rs | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/lychee-lib/src/extract/markdown.rs b/lychee-lib/src/extract/markdown.rs
index 4de6c2c6b2..ff0bfefb2b 100644
--- a/lychee-lib/src/extract/markdown.rs
+++ b/lychee-lib/src/extract/markdown.rs
@@ -1,7 +1,7 @@
 //! Extract links and fragments from markdown documents
 use std::collections::{HashMap, HashSet};
 
-use pulldown_cmark::{CowStr, Event, LinkType, Options, Parser, Tag, TagEnd};
+use pulldown_cmark::{CowStr, Event, LinkType, Options, Parser, Tag, TagEnd, TextMergeStream};
 
 use crate::{extract::plaintext::extract_raw_uri_from_plaintext, types::uri::raw::RawUri};
 
@@ -19,7 +19,7 @@ pub(crate) fn extract_markdown(input: &str, include_verbatim: bool) -> Vec<RawUr
     // which is why we keep track of entries and exits while traversing the input.
     let mut inside_code_block = false;
 
-    let parser = Parser::new_ext(input, md_extensions());
+    let parser = TextMergeStream::new(Parser::new_ext(input, md_extensions()));
     parser
         .filter_map(|event| match event {
             // A link.
@@ -349,4 +349,28 @@ $$
         let uris = extract_markdown(markdown, true);
         assert_eq!(uris, expected);
     }
+
+    #[test]
+    fn test_underscore_in_urls_middle() {
+        let markdown = r"https://example.com/_/foo";
+        let expected = vec![RawUri {
+            text: "https://example.com/_/foo".to_string(),
+            element: None,
+            attribute: None,
+        }];
+        let uris = extract_markdown(markdown, true);
+        assert_eq!(uris, expected);
+    }
+
+    #[test]
+    fn test_underscore_in_urls_end() {
+        let markdown = r"https://example.com/_";
+        let expected = vec![RawUri {
+            text: "https://example.com/_".to_string(),
+            element: None,
+            attribute: None,
+        }];
+        let uris = extract_markdown(markdown, true);
+        assert_eq!(uris, expected);
+    }
 }