From 66a48f66b86a65fc02c88389d77de93870656f48 Mon Sep 17 00:00:00 2001 From: yuin Date: Wed, 25 Dec 2019 15:07:45 +0900 Subject: [PATCH] Fixes linkify regression. https://github.github.com/gfm/#example-627 says '<' immediately ends an autolink. But goldmark had continued to autolink with '<' due to recently changes. --- extension/linkify.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension/linkify.go b/extension/linkify.go index 6d28af8..0a584e8 100644 --- a/extension/linkify.go +++ b/extension/linkify.go @@ -10,9 +10,9 @@ import ( "regexp" ) -var wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b(?:[-a-zA-Z0-9@:%_\+.~#?&//=\(\);,'"]*)`) +var wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/|[#?])[-a-zA-Z0-9@:%_\+.~#!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`) -var urlRegexp = regexp.MustCompile(`^(?:http|https|ftp):\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+\.~#$!?&//=\(\);,'"<>\^{}\[\]` + "`" + `]*)`) +var urlRegexp = regexp.MustCompile(`^(?:http|https|ftp):\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/|[#?])[-a-zA-Z0-9@:%_+.~#$!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`) type linkifyParser struct { }