Fix markdown image with link (#4675)

* Fix markdown image with link

* Add gitea copyright notice

* add a test for markdown image with link

* remove svg related variables

diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go
index 3f94aa08b43b41d2ba31aa2de543e7eff597c342..5022e0e2356739f241d2317091408d4049601aa9 100644 (file)
--- a/modules/markup/markdown/markdown.go
+++ b/modules/markup/markdown/markdown.go
@@ -1,4 +1,5 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2018 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -38,7 +39,16 @@ func (r *Renderer) Link(out *bytes.Buffer, link []byte, title []byte, content []
                link = []byte(mLink)
        }
 
-       r.Renderer.Link(out, link, title, content)
+       if len(content) > 10 && string(content[0:9]) == "<a href=\"" && bytes.Contains(content[9:], []byte("<img")) {
+               // Image with link case: markdown `[![]()]()`
+               // If the content is an image, then we change the original href around it
+               // which points to itself to a new address "link"
+               rightQuote := bytes.Index(content[9:], []byte("\""))
+               content = bytes.Replace(content, content[9:9+rightQuote], link, 1)
+               out.Write(content)
+       } else {
+               r.Renderer.Link(out, link, title, content)
+       }
 }
 
 // List renders markdown bullet or digit lists to HTML
@@ -90,13 +100,6 @@ func (r *Renderer) ListItem(out *bytes.Buffer, text []byte, flags int) {
        r.Renderer.ListItem(out, text, flags)
 }
 
-// Note: this section is for purpose of increase performance and
-// reduce memory allocation at runtime since they are constant literals.
-var (
-       svgSuffix         = []byte(".svg")
-       svgSuffixWithMark = []byte(".svg?")
-)
-
 // Image defines how images should be processed to produce corresponding HTML elements.
 func (r *Renderer) Image(out *bytes.Buffer, link []byte, title []byte, alt []byte) {
        prefix := r.URLPrefix
@@ -104,22 +107,14 @@ func (r *Renderer) Image(out *bytes.Buffer, link []byte, title []byte, alt []byt
                prefix = util.URLJoin(prefix, "wiki", "raw")
        }
        prefix = strings.Replace(prefix, "/src/", "/raw/", 1)
-       if len(link) > 0 {
-               if markup.IsLink(link) {
-                       // External link with .svg suffix usually means CI status.
-                       // TODO: define a keyword to allow non-svg images render as external link.
-                       if bytes.HasSuffix(link, svgSuffix) || bytes.Contains(link, svgSuffixWithMark) {
-                               r.Renderer.Image(out, link, title, alt)
-                               return
-                       }
-               } else {
-                       lnk := string(link)
-                       lnk = util.URLJoin(prefix, lnk)
-                       lnk = strings.Replace(lnk, " ", "+", -1)
-                       link = []byte(lnk)
-               }
+       if len(link) > 0 && !markup.IsLink(link) {
+               lnk := string(link)
+               lnk = util.URLJoin(prefix, lnk)
+               lnk = strings.Replace(lnk, " ", "+", -1)
+               link = []byte(lnk)
        }
 
+       // Put a link around it pointing to itself by default
        out.WriteString(`<a href="`)
        out.Write(link)
        out.WriteString(`">`)

diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go
index 605094df46276a0945c4c00334e19516c21bf836..a5ab84e0ec14c2263054e1c9f12b054c4bb5a2e0 100644 (file)
--- a/modules/markup/markdown/markdown_test.go
+++ b/modules/markup/markdown/markdown_test.go
@@ -73,6 +73,7 @@ func TestRender_Images(t *testing.T) {
 
        url := "../../.images/src/02/train.jpg"
        title := "Train"
+       href := "https://gitea.io"
        result := util.URLJoin(AppSubURL, url)
 
        test(
@@ -82,6 +83,9 @@ func TestRender_Images(t *testing.T) {
        test(
                "[["+title+"|"+url+"]]",
                `<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" title="`+title+`" alt="`+title+`"/></a></p>`)
+       test(
+               "[!["+title+"]("+url+")]("+href+")",
+               `<p><a href="`+href+`" rel="nofollow"><img src="`+result+`" alt="`+title+`"/></a></p>`)
 }
 
 func testAnswers(baseURLContent, baseURLImages string) []string {