Fix hash render end with colon (#31319) (#31346)

Backport #31319 by @lunny

Fix a hash render problem like `<hash>: xxxxx` which is usually used in
release notes.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

diff --git a/modules/markup/html.go b/modules/markup/html.go
index 44f88bbd113657ddf1531fe4233853290aad682a..b436ff6c3d309e4f68645bf623e278a831f1b302 100644 (file)
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -49,7 +49,7 @@ var (
        // hashCurrentPattern matches string that represents a commit SHA, e.g. d8a994ef243349f321568f9e36d5c3f444b99cae
        // Although SHA1 hashes are 40 chars long, SHA256 are 64, the regex matches the hash from 7 to 64 chars in length
        // so that abbreviated hash links can be used as well. This matches git and GitHub usability.
-       hashCurrentPattern = regexp.MustCompile(`(?:\s|^|\(|\[)([0-9a-f]{7,64})(?:\s|$|\)|\]|[.,](\s|$))`)
+       hashCurrentPattern = regexp.MustCompile(`(?:\s|^|\(|\[)([0-9a-f]{7,64})(?:\s|$|\)|\]|[.,:](\s|$))`)
 
        // shortLinkPattern matches short but difficult to parse [[name|link|arg=test]] syntax
        shortLinkPattern = regexp.MustCompile(`\[\[(.*?)\]\](\w*)`)

diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go
index 9aa9c22d701f4dc1570e44a67ab5a32e67748bb3..74089cffddfa11c257004d845a1cb0c718587001 100644 (file)
--- a/modules/markup/html_internal_test.go
+++ b/modules/markup/html_internal_test.go
@@ -380,6 +380,7 @@ func TestRegExp_sha1CurrentPattern(t *testing.T) {
                "(abcdefabcdefabcdefabcdefabcdefabcdefabcd)",
                "[abcdefabcdefabcdefabcdefabcdefabcdefabcd]",
                "abcdefabcdefabcdefabcdefabcdefabcdefabcd.",
+               "abcdefabcdefabcdefabcdefabcdefabcdefabcd:",
        }
        falseTestCases := []string{
                "test",