diff --git a/modules/markup/file_preview.go b/modules/markup/file_preview.go
index 49a5f1e8ba..3caf08f7bb 100644
--- a/modules/markup/file_preview.go
+++ b/modules/markup/file_preview.go
@@ -77,6 +77,12 @@ func newFilePreview(ctx *RenderContext, node *html.Node, locale translation.Loca
commitSha := node.Data[m[4]:m[5]]
filePath := node.Data[m[6]:m[7]]
+ urlFullSource := urlFull
+ if strings.HasSuffix(filePath, "?display=source") {
+ filePath = strings.TrimSuffix(filePath, "?display=source")
+ } else if Type(filePath) != "" {
+ urlFullSource = node.Data[m[0]:m[6]] + filePath + "?display=source#" + node.Data[m[8]:m[1]]
+ }
hash := node.Data[m[8]:m[9]]
preview.start = m[0]
@@ -113,7 +119,7 @@ func newFilePreview(ctx *RenderContext, node *html.Node, locale translation.Loca
titleBuffer.WriteString(" – ")
}
- err = html.Render(titleBuffer, createLink(urlFull, filePath, "muted"))
+ err = html.Render(titleBuffer, createLink(urlFullSource, filePath, "muted"))
if err != nil {
log.Error("failed to render filepathLink: %v", err)
}
diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index 50ea70905c..702c5a716d 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -1026,4 +1026,107 @@ func TestRender_FilePreview(t *testing.T) {
localMetas,
)
})
+
+ commitFileURL := util.URLJoin(markup.TestRepoURL, "src", "commit", "c9913120ed2c1e27c1d7752ecdb7a504dc7cf6be", "path", "to", "file.md")
+
+ t.Run("rendered file with ?display=source", func(t *testing.T) {
+ testRender(
+ commitFileURL+"?display=source"+"#L1-L2",
+ ``+
+ ``+
+ ``+
+ `
`+
+ `
`+
+ ``+
+ ``+
+ ` | `+
+ `# A`+"\n"+` | `+
+ `
`+
+ ``+
+ ` | `+
+ `B`+"\n"+` | `+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ ``+
+ ``+
+ ` | `+
+ `# A`+"\n"+` | `+
+ `
`+
+ ``+
+ ` | `+
+ `B`+"\n"+` | `+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ ``+
+ ``+
+ ` | `+
+ `B`+"\n"+` | `+
+ `
`+
+ ``+
+ ` | `+
+ `C`+"\n"+` | `+
+ `
`+
+ ``+
+ `
`+
+ `
`+
+ `