go/doc: allow ToHTML to properly handle URLs containing semicolons

Fixes #16565

Change-Id: I3edfd2576a7ca5270644a4e7f126854f821f2c9a
Reviewed-on: https://go-review.googlesource.com/25385
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/go/doc/comment.go b/src/go/doc/comment.go
index ed8eef4c61f19618fedb8c45481871c59cd3173d..15e034b6df8b7d07bd55b7f5fa4825e92959b0f1 100644 (file)
--- a/src/go/doc/comment.go
+++ b/src/go/doc/comment.go
@@ -53,7 +53,7 @@ const (
        filePart = `[a-zA-Z0-9_?%#~&/\-+=()]+` // parentheses may not be matching; see pairedParensPrefixLen
        urlRx    = `(` + protocol + `)://` +   // http://
                hostPart + `([.:]` + hostPart + `)*/?` + // //www.google.com:8080/
-               filePart + `([:.,]` + filePart + `)*`
+               filePart + `([:.,;]` + filePart + `)*`
 )
 
 var matchRx = regexp.MustCompile(`(` + urlRx + `)|(` + identRx + `)`)

diff --git a/src/go/doc/comment_test.go b/src/go/doc/comment_test.go
index ad65c2a27f8a09d22237f59287e0a06cd91c4a5c..76dfbeac796b8da3247438baa076bc6c0fb8421b 100644 (file)
--- a/src/go/doc/comment_test.go
+++ b/src/go/doc/comment_test.go
@@ -162,6 +162,7 @@ var emphasizeTests = []struct {
        {"Hello http://example.com/%2f/ /world.", `Hello <a href="http://example.com/%2f/">http://example.com/%2f/</a> /world.`},
        {"Lorem http: ipsum //host/path", "Lorem http: ipsum //host/path"},
        {"javascript://is/not/linked", "javascript://is/not/linked"},
+       {"http://git.qemu.org/?p=qemu.git;a=blob;f=qapi-schema.json;hb=HEAD", `<a href="http://git.qemu.org/?p=qemu.git;a=blob;f=qapi-schema.json;hb=HEAD">http://git.qemu.org/?p=qemu.git;a=blob;f=qapi-schema.json;hb=HEAD</a>`},
 }
 
 func TestEmphasize(t *testing.T) {