From da5edae76e75f904e395b1b712192a4d9be35ace Mon Sep 17 00:00:00 2001 From: Asko Nomm Date: Mon, 11 Apr 2022 00:33:47 +0200 Subject: Fix #12: Links where the label has dashes (`-`) do not get parsed --- src/clarktown/parsers/link_and_image.clj | 2 +- test/clarktown/parsers/link_and_image_test.clj | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/clarktown/parsers/link_and_image.clj b/src/clarktown/parsers/link_and_image.clj index fb8ad31..3be2efe 100644 --- a/src/clarktown/parsers/link_and_image.clj +++ b/src/clarktown/parsers/link_and_image.clj @@ -13,7 +13,7 @@ "Renders all occurring links and images." [block _] (loop [block block - matches (-> (re-seq #"\!?\[(\w+( \w+)*)\]\((.*?)\)" block) + matches (-> (re-seq #"\!?\[([a-zA-Z0-9\-\.\,]+( [a-zA-Z0-9\-\.\,]+)*)\]\((.*?)\)" block) distinct)] (if (empty? matches) block diff --git a/test/clarktown/parsers/link_and_image_test.clj b/test/clarktown/parsers/link_and_image_test.clj index 5630306..348a8f9 100644 --- a/test/clarktown/parsers/link_and_image_test.clj +++ b/test/clarktown/parsers/link_and_image_test.clj @@ -9,6 +9,9 @@ (is (= (link-and-image/render "[This is a link](https://example.com)" nil) "This is a link")) + (is (= (link-and-image/render "[This-is-a-link](https://example.com)" nil) + "This-is-a-link")) + (is (= (link-and-image/render "[x] [label](link)" nil) "[x] label")) -- cgit v1.2.3