* Get rid of autolink * autolink in markdown * Replace email addresses with mailto links * better handling of links * Remove autolink.js from footer * Refactor entire html.go * fix some bugs * Make tests green, move what we can to html_internal_test, various other changes to processor logic * Make markdown tests work again This is just a description to allow me to force push in order to restart the drone build. * Fix failing markdown tests in routers/api/v1/misc * Add license headers, log errors, future-proof <body> * fix formattingtags/v1.5.0-dev
@@ -0,0 +1,382 @@ | |||
// 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. | |||
package markup | |||
import ( | |||
"fmt" | |||
"strconv" | |||
"strings" | |||
"testing" | |||
"code.gitea.io/gitea/modules/setting" | |||
"code.gitea.io/gitea/modules/util" | |||
"github.com/stretchr/testify/assert" | |||
) | |||
const AppURL = "http://localhost:3000/" | |||
const Repo = "gogits/gogs" | |||
const AppSubURL = AppURL + Repo + "/" | |||
// alphanumLink an HTML link to an alphanumeric-style issue | |||
func alphanumIssueLink(baseURL string, name string) string { | |||
return link(util.URLJoin(baseURL, name), name) | |||
} | |||
// numericLink an HTML to a numeric-style issue | |||
func numericIssueLink(baseURL string, index int) string { | |||
return link(util.URLJoin(baseURL, strconv.Itoa(index)), fmt.Sprintf("#%d", index)) | |||
} | |||
// urlContentsLink an HTML link whose contents is the target URL | |||
func urlContentsLink(href string) string { | |||
return link(href, href) | |||
} | |||
// link an HTML link | |||
func link(href, contents string) string { | |||
return fmt.Sprintf("<a href=\"%s\">%s</a>", href, contents) | |||
} | |||
var numericMetas = map[string]string{ | |||
"format": "https://someurl.com/{user}/{repo}/{index}", | |||
"user": "someUser", | |||
"repo": "someRepo", | |||
"style": IssueNameStyleNumeric, | |||
} | |||
var alphanumericMetas = map[string]string{ | |||
"format": "https://someurl.com/{user}/{repo}/{index}", | |||
"user": "someUser", | |||
"repo": "someRepo", | |||
"style": IssueNameStyleAlphanumeric, | |||
} | |||
func TestRender_IssueIndexPattern(t *testing.T) { | |||
// numeric: render inputs without valid mentions | |||
test := func(s string) { | |||
testRenderIssueIndexPattern(t, s, s, nil) | |||
testRenderIssueIndexPattern(t, s, s, &postProcessCtx{metas: numericMetas}) | |||
} | |||
// should not render anything when there are no mentions | |||
test("") | |||
test("this is a test") | |||
test("test 123 123 1234") | |||
test("#") | |||
test("# # #") | |||
test("# 123") | |||
test("#abcd") | |||
test("test#1234") | |||
test("#1234test") | |||
test(" test #1234test") | |||
// should not render issue mention without leading space | |||
test("test#54321 issue") | |||
// should not render issue mention without trailing space | |||
test("test #54321issue") | |||
} | |||
func TestRender_IssueIndexPattern2(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
// numeric: render inputs with valid mentions | |||
test := func(s, expectedFmt string, indices ...int) { | |||
links := make([]interface{}, len(indices)) | |||
for i, index := range indices { | |||
links[i] = numericIssueLink(util.URLJoin(setting.AppSubURL, "issues"), index) | |||
} | |||
expectedNil := fmt.Sprintf(expectedFmt, links...) | |||
testRenderIssueIndexPattern(t, s, expectedNil, nil) | |||
for i, index := range indices { | |||
links[i] = numericIssueLink("https://someurl.com/someUser/someRepo/", index) | |||
} | |||
expectedNum := fmt.Sprintf(expectedFmt, links...) | |||
testRenderIssueIndexPattern(t, s, expectedNum, &postProcessCtx{metas: numericMetas}) | |||
} | |||
// should render freestanding mentions | |||
test("#1234 test", "%s test", 1234) | |||
test("test #8 issue", "test %s issue", 8) | |||
test("test issue #1234", "test issue %s", 1234) | |||
// should render mentions in parentheses | |||
test("(#54321 issue)", "(%s issue)", 54321) | |||
test("test (#9801 extra) issue", "test (%s extra) issue", 9801) | |||
test("test (#1)", "test (%s)", 1) | |||
// should render multiple issue mentions in the same line | |||
test("#54321 #1243", "%s %s", 54321, 1243) | |||
test("wow (#54321 #1243)", "wow (%s %s)", 54321, 1243) | |||
test("(#4)(#5)", "(%s)(%s)", 4, 5) | |||
test("#1 (#4321) test", "%s (%s) test", 1, 4321) | |||
} | |||
func TestRender_IssueIndexPattern3(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
// alphanumeric: render inputs without valid mentions | |||
test := func(s string) { | |||
testRenderIssueIndexPattern(t, s, s, &postProcessCtx{metas: alphanumericMetas}) | |||
} | |||
test("") | |||
test("this is a test") | |||
test("test 123 123 1234") | |||
test("#") | |||
test("# 123") | |||
test("#abcd") | |||
test("test #123") | |||
test("abc-1234") // issue prefix must be capital | |||
test("ABc-1234") // issue prefix must be _all_ capital | |||
test("ABCDEFGHIJK-1234") // the limit is 10 characters in the prefix | |||
test("ABC1234") // dash is required | |||
test("test ABC- test") // number is required | |||
test("test -1234 test") // prefix is required | |||
test("testABC-123 test") // leading space is required | |||
test("test ABC-123test") // trailing space is required | |||
test("ABC-0123") // no leading zero | |||
} | |||
func TestRender_IssueIndexPattern4(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
// alphanumeric: render inputs with valid mentions | |||
test := func(s, expectedFmt string, names ...string) { | |||
links := make([]interface{}, len(names)) | |||
for i, name := range names { | |||
links[i] = alphanumIssueLink("https://someurl.com/someUser/someRepo/", name) | |||
} | |||
expected := fmt.Sprintf(expectedFmt, links...) | |||
testRenderIssueIndexPattern(t, s, expected, &postProcessCtx{metas: alphanumericMetas}) | |||
} | |||
test("OTT-1234 test", "%s test", "OTT-1234") | |||
test("test T-12 issue", "test %s issue", "T-12") | |||
test("test issue ABCDEFGHIJ-1234567890", "test issue %s", "ABCDEFGHIJ-1234567890") | |||
} | |||
func testRenderIssueIndexPattern(t *testing.T, input, expected string, ctx *postProcessCtx) { | |||
if ctx == nil { | |||
ctx = new(postProcessCtx) | |||
} | |||
ctx.procs = []processor{issueIndexPatternProcessor} | |||
if ctx.urlPrefix == "" { | |||
ctx.urlPrefix = AppSubURL | |||
} | |||
res, err := ctx.postProcess([]byte(input)) | |||
assert.NoError(t, err) | |||
assert.Equal(t, expected, string(res)) | |||
} | |||
func TestRender_AutoLink(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
test := func(input, expected string) { | |||
buffer, err := PostProcess([]byte(input), setting.AppSubURL, nil, false) | |||
assert.Equal(t, err, nil) | |||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer))) | |||
buffer, err = PostProcess([]byte(input), setting.AppSubURL, nil, true) | |||
assert.Equal(t, err, nil) | |||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer))) | |||
} | |||
// render valid issue URLs | |||
test(util.URLJoin(setting.AppSubURL, "issues", "3333"), | |||
numericIssueLink(util.URLJoin(setting.AppSubURL, "issues"), 3333)) | |||
// render valid commit URLs | |||
tmp := util.URLJoin(AppSubURL, "commit", "d8a994ef243349f321568f9e36d5c3f444b99cae") | |||
test(tmp, "<a href=\""+tmp+"\">d8a994ef24</a>") | |||
tmp += "#diff-2" | |||
test(tmp, "<a href=\""+tmp+"\">d8a994ef24 (diff-2)</a>") | |||
// render other commit URLs | |||
tmp = "https://external-link.gogs.io/gogs/gogs/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2" | |||
test(tmp, "<a href=\""+tmp+"\">d8a994ef24 (diff-2)</a>") | |||
} | |||
func TestRender_FullIssueURLs(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
test := func(input, expected string) { | |||
ctx := new(postProcessCtx) | |||
ctx.procs = []processor{fullIssuePatternProcessor} | |||
if ctx.urlPrefix == "" { | |||
ctx.urlPrefix = AppSubURL | |||
} | |||
result, err := ctx.postProcess([]byte(input)) | |||
assert.NoError(t, err) | |||
assert.Equal(t, expected, string(result)) | |||
} | |||
test("Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6", | |||
"Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6") | |||
test("Look here http://localhost:3000/person/repo/issues/4", | |||
`Look here <a href="http://localhost:3000/person/repo/issues/4">#4</a>`) | |||
test("http://localhost:3000/person/repo/issues/4#issuecomment-1234", | |||
`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234">#4</a>`) | |||
} | |||
func TestRegExp_issueNumericPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"#1234", | |||
"#0", | |||
"#1234567890987654321", | |||
" #12", | |||
} | |||
falseTestCases := []string{ | |||
"# 1234", | |||
"# 0", | |||
"# ", | |||
"#", | |||
"#ABC", | |||
"#1A2B", | |||
"", | |||
"ABC", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, issueNumericPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, issueNumericPattern.MatchString(testCase)) | |||
} | |||
} | |||
func TestRegExp_sha1CurrentPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"d8a994ef243349f321568f9e36d5c3f444b99cae", | |||
"abcdefabcdefabcdefabcdefabcdefabcdefabcd", | |||
} | |||
falseTestCases := []string{ | |||
"test", | |||
"abcdefg", | |||
"abcdefghijklmnopqrstuvwxyzabcdefghijklmn", | |||
"abcdefghijklmnopqrstuvwxyzabcdefghijklmO", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, sha1CurrentPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, sha1CurrentPattern.MatchString(testCase)) | |||
} | |||
} | |||
func TestRegExp_anySHA1Pattern(t *testing.T) { | |||
testCases := map[string][]string{ | |||
"https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js#L2703": { | |||
"a644101ed04d0beacea864ce805e0c4f86ba1cd1", | |||
"test/unit/event.js", | |||
"L2703", | |||
}, | |||
"https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js": { | |||
"a644101ed04d0beacea864ce805e0c4f86ba1cd1", | |||
"test/unit/event.js", | |||
"", | |||
}, | |||
"https://github.com/jquery/jquery/commit/0705be475092aede1eddae01319ec931fb9c65fc": { | |||
"0705be475092aede1eddae01319ec931fb9c65fc", | |||
"", | |||
"", | |||
}, | |||
"https://github.com/jquery/jquery/tree/0705be475092aede1eddae01319ec931fb9c65fc/src": { | |||
"0705be475092aede1eddae01319ec931fb9c65fc", | |||
"src", | |||
"", | |||
}, | |||
"https://try.gogs.io/gogs/gogs/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2": { | |||
"d8a994ef243349f321568f9e36d5c3f444b99cae", | |||
"", | |||
"diff-2", | |||
}, | |||
} | |||
for k, v := range testCases { | |||
assert.Equal(t, anySHA1Pattern.FindStringSubmatch(k)[1:], v) | |||
} | |||
} | |||
func TestRegExp_mentionPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"@Unknwon", | |||
"@ANT_123", | |||
"@xxx-DiN0-z-A..uru..s-xxx", | |||
" @lol ", | |||
" @Te/st", | |||
} | |||
falseTestCases := []string{ | |||
"@ 0", | |||
"@ ", | |||
"@", | |||
"", | |||
"ABC", | |||
} | |||
for _, testCase := range trueTestCases { | |||
res := mentionPattern.MatchString(testCase) | |||
assert.True(t, res) | |||
} | |||
for _, testCase := range falseTestCases { | |||
res := mentionPattern.MatchString(testCase) | |||
assert.False(t, res) | |||
} | |||
} | |||
func TestRegExp_issueAlphanumericPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"ABC-1234", | |||
"A-1", | |||
"RC-80", | |||
"ABCDEFGHIJ-1234567890987654321234567890", | |||
} | |||
falseTestCases := []string{ | |||
"RC-08", | |||
"PR-0", | |||
"ABCDEFGHIJK-1", | |||
"PR_1", | |||
"", | |||
"#ABC", | |||
"", | |||
"ABC", | |||
"GG-", | |||
"rm-1", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, issueAlphanumericPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, issueAlphanumericPattern.MatchString(testCase)) | |||
} | |||
} | |||
func TestRegExp_shortLinkPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"[[stuff]]", | |||
"[[]]", | |||
"[[stuff|title=Difficult name with spaces*!]]", | |||
} | |||
falseTestCases := []string{ | |||
"test", | |||
"abcdefg", | |||
"[[]", | |||
"[[", | |||
"[]", | |||
"]]", | |||
"abcdefghijklmnopqrstuvwxyz", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, shortLinkPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, shortLinkPattern.MatchString(testCase)) | |||
} | |||
} |
@@ -5,227 +5,17 @@ | |||
package markup_test | |||
import ( | |||
"fmt" | |||
"strconv" | |||
"strings" | |||
"testing" | |||
. "code.gitea.io/gitea/modules/markup" | |||
_ "code.gitea.io/gitea/modules/markup/markdown" | |||
"code.gitea.io/gitea/modules/markup/markdown" | |||
"code.gitea.io/gitea/modules/setting" | |||
"code.gitea.io/gitea/modules/util" | |||
"github.com/stretchr/testify/assert" | |||
) | |||
const AppURL = "http://localhost:3000/" | |||
const Repo = "gogits/gogs" | |||
const AppSubURL = AppURL + Repo + "/" | |||
var numericMetas = map[string]string{ | |||
"format": "https://someurl.com/{user}/{repo}/{index}", | |||
"user": "someUser", | |||
"repo": "someRepo", | |||
"style": IssueNameStyleNumeric, | |||
} | |||
var alphanumericMetas = map[string]string{ | |||
"format": "https://someurl.com/{user}/{repo}/{index}", | |||
"user": "someUser", | |||
"repo": "someRepo", | |||
"style": IssueNameStyleAlphanumeric, | |||
} | |||
// numericLink an HTML to a numeric-style issue | |||
func numericIssueLink(baseURL string, index int) string { | |||
return link(util.URLJoin(baseURL, strconv.Itoa(index)), fmt.Sprintf("#%d", index)) | |||
} | |||
// alphanumLink an HTML link to an alphanumeric-style issue | |||
func alphanumIssueLink(baseURL string, name string) string { | |||
return link(util.URLJoin(baseURL, name), name) | |||
} | |||
// urlContentsLink an HTML link whose contents is the target URL | |||
func urlContentsLink(href string) string { | |||
return link(href, href) | |||
} | |||
// link an HTML link | |||
func link(href, contents string) string { | |||
return fmt.Sprintf("<a href=\"%s\">%s</a>", href, contents) | |||
} | |||
func testRenderIssueIndexPattern(t *testing.T, input, expected string, opts RenderIssueIndexPatternOptions) { | |||
if len(opts.URLPrefix) == 0 { | |||
opts.URLPrefix = AppSubURL | |||
} | |||
actual := string(RenderIssueIndexPattern([]byte(input), opts)) | |||
assert.Equal(t, expected, actual) | |||
} | |||
func TestRender_IssueIndexPattern(t *testing.T) { | |||
// numeric: render inputs without valid mentions | |||
test := func(s string) { | |||
testRenderIssueIndexPattern(t, s, s, RenderIssueIndexPatternOptions{}) | |||
testRenderIssueIndexPattern(t, s, s, RenderIssueIndexPatternOptions{Metas: numericMetas}) | |||
} | |||
// should not render anything when there are no mentions | |||
test("") | |||
test("this is a test") | |||
test("test 123 123 1234") | |||
test("#") | |||
test("# # #") | |||
test("# 123") | |||
test("#abcd") | |||
test("##1234") | |||
test("test#1234") | |||
test("#1234test") | |||
test(" test #1234test") | |||
// should not render issue mention without leading space | |||
test("test#54321 issue") | |||
// should not render issue mention without trailing space | |||
test("test #54321issue") | |||
} | |||
func TestRender_IssueIndexPattern2(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
// numeric: render inputs with valid mentions | |||
test := func(s, expectedFmt string, indices ...int) { | |||
links := make([]interface{}, len(indices)) | |||
for i, index := range indices { | |||
links[i] = numericIssueLink(util.URLJoin(setting.AppSubURL, "issues"), index) | |||
} | |||
expectedNil := fmt.Sprintf(expectedFmt, links...) | |||
testRenderIssueIndexPattern(t, s, expectedNil, RenderIssueIndexPatternOptions{}) | |||
for i, index := range indices { | |||
links[i] = numericIssueLink("https://someurl.com/someUser/someRepo/", index) | |||
} | |||
expectedNum := fmt.Sprintf(expectedFmt, links...) | |||
testRenderIssueIndexPattern(t, s, expectedNum, RenderIssueIndexPatternOptions{Metas: numericMetas}) | |||
} | |||
// should render freestanding mentions | |||
test("#1234 test", "%s test", 1234) | |||
test("test #8 issue", "test %s issue", 8) | |||
test("test issue #1234", "test issue %s", 1234) | |||
// should render mentions in parentheses | |||
test("(#54321 issue)", "(%s issue)", 54321) | |||
test("test (#9801 extra) issue", "test (%s extra) issue", 9801) | |||
test("test (#1)", "test (%s)", 1) | |||
// should render multiple issue mentions in the same line | |||
test("#54321 #1243", "%s %s", 54321, 1243) | |||
test("wow (#54321 #1243)", "wow (%s %s)", 54321, 1243) | |||
test("(#4)(#5)", "(%s)(%s)", 4, 5) | |||
test("#1 (#4321) test", "%s (%s) test", 1, 4321) | |||
} | |||
func TestRender_IssueIndexPattern3(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
// alphanumeric: render inputs without valid mentions | |||
test := func(s string) { | |||
testRenderIssueIndexPattern(t, s, s, RenderIssueIndexPatternOptions{Metas: alphanumericMetas}) | |||
} | |||
test("") | |||
test("this is a test") | |||
test("test 123 123 1234") | |||
test("#") | |||
test("##1234") | |||
test("# 123") | |||
test("#abcd") | |||
test("test #123") | |||
test("abc-1234") // issue prefix must be capital | |||
test("ABc-1234") // issue prefix must be _all_ capital | |||
test("ABCDEFGHIJK-1234") // the limit is 10 characters in the prefix | |||
test("ABC1234") // dash is required | |||
test("test ABC- test") // number is required | |||
test("test -1234 test") // prefix is required | |||
test("testABC-123 test") // leading space is required | |||
test("test ABC-123test") // trailing space is required | |||
test("ABC-0123") // no leading zero | |||
} | |||
func TestRender_IssueIndexPattern4(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
// alphanumeric: render inputs with valid mentions | |||
test := func(s, expectedFmt string, names ...string) { | |||
links := make([]interface{}, len(names)) | |||
for i, name := range names { | |||
links[i] = alphanumIssueLink("https://someurl.com/someUser/someRepo/", name) | |||
} | |||
expected := fmt.Sprintf(expectedFmt, links...) | |||
testRenderIssueIndexPattern(t, s, expected, RenderIssueIndexPatternOptions{Metas: alphanumericMetas}) | |||
} | |||
test("OTT-1234 test", "%s test", "OTT-1234") | |||
test("test T-12 issue", "test %s issue", "T-12") | |||
test("test issue ABCDEFGHIJ-1234567890", "test issue %s", "ABCDEFGHIJ-1234567890") | |||
} | |||
func TestRenderIssueIndexPatternWithDefaultURL(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
test := func(input string, expected string) { | |||
testRenderIssueIndexPattern(t, input, expected, RenderIssueIndexPatternOptions{ | |||
DefaultURL: AppURL, | |||
}) | |||
} | |||
test("hello #123 world", | |||
fmt.Sprintf(`<a rel="nofollow" href="%s">hello</a> `, AppURL)+ | |||
fmt.Sprintf(`<a href="%sissues/123">#123</a> `, AppSubURL)+ | |||
fmt.Sprintf(`<a rel="nofollow" href="%s">world</a>`, AppURL)) | |||
test("hello (#123) world", | |||
fmt.Sprintf(`<a rel="nofollow" href="%s">hello </a>`, AppURL)+ | |||
fmt.Sprintf(`(<a href="%sissues/123">#123</a>)`, AppSubURL)+ | |||
fmt.Sprintf(`<a rel="nofollow" href="%s"> world</a>`, AppURL)) | |||
} | |||
func TestRender_AutoLink(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
test := func(input, expected string) { | |||
buffer := RenderSpecialLink([]byte(input), setting.AppSubURL, nil, false) | |||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer))) | |||
buffer = RenderSpecialLink([]byte(input), setting.AppSubURL, nil, true) | |||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer))) | |||
} | |||
// render valid issue URLs | |||
test(util.URLJoin(setting.AppSubURL, "issues", "3333"), | |||
numericIssueLink(util.URLJoin(setting.AppSubURL, "issues"), 3333)) | |||
// render external issue URLs | |||
for _, externalURL := range []string{ | |||
"http://1111/2222/ssss-issues/3333?param=blah&blahh=333", | |||
"http://test.com/issues/33333", | |||
"https://issues/333"} { | |||
test(externalURL, externalURL) | |||
} | |||
// render valid commit URLs | |||
tmp := util.URLJoin(AppSubURL, "commit", "d8a994ef243349f321568f9e36d5c3f444b99cae") | |||
test(tmp, "<a href=\""+tmp+"\">d8a994ef24</a>") | |||
tmp += "#diff-2" | |||
test(tmp, "<a href=\""+tmp+"\">d8a994ef24 (diff-2)</a>") | |||
// render other commit URLs | |||
tmp = "https://external-link.gogs.io/gogs/gogs/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2" | |||
test(tmp, "<a href=\""+tmp+"\">d8a994ef24 (diff-2)</a>") | |||
} | |||
func TestRender_Commits(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
@@ -239,13 +29,12 @@ func TestRender_Commits(t *testing.T) { | |||
var commit = util.URLJoin(AppSubURL, "commit", sha) | |||
var subtree = util.URLJoin(commit, "src") | |||
var tree = strings.Replace(subtree, "/commit/", "/tree/", -1) | |||
var src = strings.Replace(subtree, "/commit/", "/src/", -1) | |||
test(sha, `<p><a href="`+commit+`" rel="nofollow">b6dd6210ea</a></p>`) | |||
test(sha[:7], `<p><a href="`+commit[:len(commit)-(40-7)]+`" rel="nofollow">b6dd621</a></p>`) | |||
test(sha[:39], `<p><a href="`+commit[:len(commit)-(40-39)]+`" rel="nofollow">b6dd6210ea</a></p>`) | |||
test(commit, `<p><a href="`+commit+`" rel="nofollow">b6dd6210ea</a></p>`) | |||
test(tree, `<p><a href="`+src+`" rel="nofollow">b6dd6210ea/src</a></p>`) | |||
test(tree, `<p><a href="`+tree+`" rel="nofollow">b6dd6210ea/src</a></p>`) | |||
test("commit "+sha, `<p>commit <a href="`+commit+`" rel="nofollow">b6dd6210ea</a></p>`) | |||
} | |||
@@ -266,193 +55,6 @@ func TestRender_CrossReferences(t *testing.T) { | |||
`<p><a href="`+util.URLJoin(AppURL, "go-gitea", "gitea", "issues", "12345")+`" rel="nofollow">go-gitea/gitea#12345</a></p>`) | |||
} | |||
func TestRender_FullIssueURLs(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
test := func(input, expected string) { | |||
result := RenderFullIssuePattern([]byte(input)) | |||
assert.Equal(t, expected, string(result)) | |||
} | |||
test("Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6", | |||
"Here is a link https://git.osgeo.org/gogs/postgis/postgis/pulls/6") | |||
test("Look here http://localhost:3000/person/repo/issues/4", | |||
`Look here <a href="http://localhost:3000/person/repo/issues/4">#4</a>`) | |||
test("http://localhost:3000/person/repo/issues/4#issuecomment-1234", | |||
`<a href="http://localhost:3000/person/repo/issues/4#issuecomment-1234">#4</a>`) | |||
} | |||
func TestRegExp_MentionPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"@Unknwon", | |||
"@ANT_123", | |||
"@xxx-DiN0-z-A..uru..s-xxx", | |||
" @lol ", | |||
" @Te/st", | |||
} | |||
falseTestCases := []string{ | |||
"@ 0", | |||
"@ ", | |||
"@", | |||
"", | |||
"ABC", | |||
} | |||
for _, testCase := range trueTestCases { | |||
res := MentionPattern.MatchString(testCase) | |||
if !res { | |||
println() | |||
println(testCase) | |||
} | |||
assert.True(t, res) | |||
} | |||
for _, testCase := range falseTestCases { | |||
res := MentionPattern.MatchString(testCase) | |||
if res { | |||
println() | |||
println(testCase) | |||
} | |||
assert.False(t, res) | |||
} | |||
} | |||
func TestRegExp_IssueNumericPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"#1234", | |||
"#0", | |||
"#1234567890987654321", | |||
"[#1234]", | |||
} | |||
falseTestCases := []string{ | |||
"# 1234", | |||
"# 0", | |||
"# ", | |||
"#", | |||
"#ABC", | |||
"#1A2B", | |||
"", | |||
"ABC", | |||
"[]", | |||
"[x]", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, IssueNumericPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, IssueNumericPattern.MatchString(testCase)) | |||
} | |||
} | |||
func TestRegExp_IssueAlphanumericPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"ABC-1234", | |||
"A-1", | |||
"RC-80", | |||
"ABCDEFGHIJ-1234567890987654321234567890", | |||
"[JIRA-134]", | |||
} | |||
falseTestCases := []string{ | |||
"RC-08", | |||
"PR-0", | |||
"ABCDEFGHIJK-1", | |||
"PR_1", | |||
"", | |||
"#ABC", | |||
"", | |||
"ABC", | |||
"GG-", | |||
"rm-1", | |||
"[]", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, IssueAlphanumericPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, IssueAlphanumericPattern.MatchString(testCase)) | |||
} | |||
} | |||
func TestRegExp_Sha1CurrentPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"d8a994ef243349f321568f9e36d5c3f444b99cae", | |||
"abcdefabcdefabcdefabcdefabcdefabcdefabcd", | |||
} | |||
falseTestCases := []string{ | |||
"test", | |||
"abcdefg", | |||
"abcdefghijklmnopqrstuvwxyzabcdefghijklmn", | |||
"abcdefghijklmnopqrstuvwxyzabcdefghijklmO", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, Sha1CurrentPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, Sha1CurrentPattern.MatchString(testCase)) | |||
} | |||
} | |||
func TestRegExp_AnySHA1Pattern(t *testing.T) { | |||
testCases := map[string][]string{ | |||
"https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js#L2703": { | |||
"https", | |||
"github.com", | |||
"jquery", | |||
"jquery", | |||
"blob", | |||
"a644101ed04d0beacea864ce805e0c4f86ba1cd1", | |||
"test/unit/event.js", | |||
"L2703", | |||
}, | |||
"https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js": { | |||
"https", | |||
"github.com", | |||
"jquery", | |||
"jquery", | |||
"blob", | |||
"a644101ed04d0beacea864ce805e0c4f86ba1cd1", | |||
"test/unit/event.js", | |||
"", | |||
}, | |||
"https://github.com/jquery/jquery/commit/0705be475092aede1eddae01319ec931fb9c65fc": { | |||
"https", | |||
"github.com", | |||
"jquery", | |||
"jquery", | |||
"commit", | |||
"0705be475092aede1eddae01319ec931fb9c65fc", | |||
"", | |||
"", | |||
}, | |||
"https://github.com/jquery/jquery/tree/0705be475092aede1eddae01319ec931fb9c65fc/src": { | |||
"https", | |||
"github.com", | |||
"jquery", | |||
"jquery", | |||
"tree", | |||
"0705be475092aede1eddae01319ec931fb9c65fc", | |||
"src", | |||
"", | |||
}, | |||
"https://try.gogs.io/gogs/gogs/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2": { | |||
"https", | |||
"try.gogs.io", | |||
"gogs", | |||
"gogs", | |||
"commit", | |||
"d8a994ef243349f321568f9e36d5c3f444b99cae", | |||
"", | |||
"diff-2", | |||
}, | |||
} | |||
for k, v := range testCases { | |||
assert.Equal(t, AnySHA1Pattern.FindStringSubmatch(k)[1:], v) | |||
} | |||
} | |||
func TestMisc_IsSameDomain(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
@@ -464,3 +66,66 @@ func TestMisc_IsSameDomain(t *testing.T) { | |||
assert.False(t, IsSameDomain("http://google.com/ncr")) | |||
assert.False(t, IsSameDomain("favicon.ico")) | |||
} | |||
func TestRender_ShortLinks(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
tree := util.URLJoin(AppSubURL, "src", "master") | |||
test := func(input, expected, expectedWiki string) { | |||
buffer := markdown.RenderString(input, tree, nil) | |||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer))) | |||
buffer = markdown.RenderWiki([]byte(input), setting.AppSubURL, nil) | |||
assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(string(buffer))) | |||
} | |||
rawtree := util.URLJoin(AppSubURL, "raw", "master") | |||
url := util.URLJoin(tree, "Link") | |||
otherURL := util.URLJoin(tree, "OtherLink") | |||
imgurl := util.URLJoin(rawtree, "Link.jpg") | |||
urlWiki := util.URLJoin(AppSubURL, "wiki", "Link") | |||
otherURLWiki := util.URLJoin(AppSubURL, "wiki", "OtherLink") | |||
imgurlWiki := util.URLJoin(AppSubURL, "wiki", "raw", "Link.jpg") | |||
favicon := "http://google.com/favicon.ico" | |||
test( | |||
"[[Link]]", | |||
`<p><a href="`+url+`" rel="nofollow">Link</a></p>`, | |||
`<p><a href="`+urlWiki+`" rel="nofollow">Link</a></p>`) | |||
test( | |||
"[[Link.jpg]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Link.jpg" alt="Link.jpg"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Link.jpg" alt="Link.jpg"/></a></p>`) | |||
test( | |||
"[["+favicon+"]]", | |||
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico"/></a></p>`, | |||
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico"/></a></p>`) | |||
test( | |||
"[[Name|Link]]", | |||
`<p><a href="`+url+`" rel="nofollow">Name</a></p>`, | |||
`<p><a href="`+urlWiki+`" rel="nofollow">Name</a></p>`) | |||
test( | |||
"[[Name|Link.jpg]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Name" alt="Name"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Name" alt="Name"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|alt=AltName]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="AltName" alt="AltName"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="AltName" alt="AltName"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|title=Title]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Title" alt="Title"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Title" alt="Title"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|alt=AltName|title=Title]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Title" alt="AltName"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Title" alt="AltName"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|alt=\"AltName\"|title='Title']]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" title="Title" alt="AltName"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" title="Title" alt="AltName"/></a></p>`) | |||
test( | |||
"[[Link]] [[OtherLink]]", | |||
`<p><a href="`+url+`" rel="nofollow">Link</a> <a href="`+otherURL+`" rel="nofollow">OtherLink</a></p>`, | |||
`<p><a href="`+urlWiki+`" rel="nofollow">Link</a> <a href="`+otherURLWiki+`" rel="nofollow">OtherLink</a></p>`) | |||
} |
@@ -22,17 +22,20 @@ type Renderer struct { | |||
IsWiki bool | |||
} | |||
var byteMailto = []byte("mailto:") | |||
// Link defines how formal links should be processed to produce corresponding HTML elements. | |||
func (r *Renderer) Link(out *bytes.Buffer, link []byte, title []byte, content []byte) { | |||
if len(link) > 0 && !markup.IsLink(link) { | |||
if link[0] != '#' { | |||
lnk := string(link) | |||
if r.IsWiki { | |||
lnk = util.URLJoin("wiki", lnk) | |||
} | |||
mLink := util.URLJoin(r.URLPrefix, lnk) | |||
link = []byte(mLink) | |||
// special case: this is not a link, a hash link or a mailto:, so it's a | |||
// relative URL | |||
if len(link) > 0 && !markup.IsLink(link) && | |||
link[0] != '#' && !bytes.HasPrefix(link, byteMailto) { | |||
lnk := string(link) | |||
if r.IsWiki { | |||
lnk = util.URLJoin("wiki", lnk) | |||
} | |||
mLink := util.URLJoin(r.URLPrefix, lnk) | |||
link = []byte(mLink) | |||
} | |||
r.Renderer.Link(out, link, title, content) | |||
@@ -124,30 +127,33 @@ func (r *Renderer) Image(out *bytes.Buffer, link []byte, title []byte, alt []byt | |||
out.WriteString("</a>") | |||
} | |||
const ( | |||
blackfridayExtensions = 0 | | |||
blackfriday.EXTENSION_NO_INTRA_EMPHASIS | | |||
blackfriday.EXTENSION_TABLES | | |||
blackfriday.EXTENSION_FENCED_CODE | | |||
blackfriday.EXTENSION_STRIKETHROUGH | | |||
blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK | |||
blackfridayHTMLFlags = 0 | | |||
blackfriday.HTML_SKIP_STYLE | | |||
blackfriday.HTML_OMIT_CONTENTS | | |||
blackfriday.HTML_USE_SMARTYPANTS | |||
) | |||
// RenderRaw renders Markdown to HTML without handling special links. | |||
func RenderRaw(body []byte, urlPrefix string, wikiMarkdown bool) []byte { | |||
htmlFlags := 0 | |||
htmlFlags |= blackfriday.HTML_SKIP_STYLE | |||
htmlFlags |= blackfriday.HTML_OMIT_CONTENTS | |||
renderer := &Renderer{ | |||
Renderer: blackfriday.HtmlRenderer(htmlFlags, "", ""), | |||
Renderer: blackfriday.HtmlRenderer(blackfridayHTMLFlags, "", ""), | |||
URLPrefix: urlPrefix, | |||
IsWiki: wikiMarkdown, | |||
} | |||
// set up the parser | |||
extensions := 0 | |||
extensions |= blackfriday.EXTENSION_NO_INTRA_EMPHASIS | |||
extensions |= blackfriday.EXTENSION_TABLES | |||
extensions |= blackfriday.EXTENSION_FENCED_CODE | |||
extensions |= blackfriday.EXTENSION_STRIKETHROUGH | |||
extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK | |||
exts := blackfridayExtensions | |||
if setting.Markdown.EnableHardLineBreak { | |||
extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK | |||
exts |= blackfriday.EXTENSION_HARD_LINE_BREAK | |||
} | |||
body = blackfriday.Markdown(body, renderer, extensions) | |||
body = blackfriday.Markdown(body, renderer, exts) | |||
return body | |||
} | |||
@@ -8,7 +8,6 @@ import ( | |||
"strings" | |||
"testing" | |||
"code.gitea.io/gitea/modules/markup" | |||
. "code.gitea.io/gitea/modules/markup/markdown" | |||
"code.gitea.io/gitea/modules/setting" | |||
"code.gitea.io/gitea/modules/util" | |||
@@ -41,69 +40,6 @@ func TestRender_StandardLinks(t *testing.T) { | |||
`<p><a href="`+lnkWiki+`" rel="nofollow">WikiPage</a></p>`) | |||
} | |||
func TestRender_ShortLinks(t *testing.T) { | |||
setting.AppURL = AppURL | |||
setting.AppSubURL = AppSubURL | |||
tree := util.URLJoin(AppSubURL, "src", "master") | |||
test := func(input, expected, expectedWiki string) { | |||
buffer := RenderString(input, tree, nil) | |||
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer))) | |||
buffer = RenderWiki([]byte(input), setting.AppSubURL, nil) | |||
assert.Equal(t, strings.TrimSpace(expectedWiki), strings.TrimSpace(string(buffer))) | |||
} | |||
rawtree := util.URLJoin(AppSubURL, "raw", "master") | |||
url := util.URLJoin(tree, "Link") | |||
otherUrl := util.URLJoin(tree, "OtherLink") | |||
imgurl := util.URLJoin(rawtree, "Link.jpg") | |||
urlWiki := util.URLJoin(AppSubURL, "wiki", "Link") | |||
otherUrlWiki := util.URLJoin(AppSubURL, "wiki", "OtherLink") | |||
imgurlWiki := util.URLJoin(AppSubURL, "wiki", "raw", "Link.jpg") | |||
favicon := "http://google.com/favicon.ico" | |||
test( | |||
"[[Link]]", | |||
`<p><a href="`+url+`" rel="nofollow">Link</a></p>`, | |||
`<p><a href="`+urlWiki+`" rel="nofollow">Link</a></p>`) | |||
test( | |||
"[[Link.jpg]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" alt="Link.jpg" title="Link.jpg"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" alt="Link.jpg" title="Link.jpg"/></a></p>`) | |||
test( | |||
"[["+favicon+"]]", | |||
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico"/></a></p>`, | |||
`<p><a href="`+favicon+`" rel="nofollow"><img src="`+favicon+`" title="favicon.ico"/></a></p>`) | |||
test( | |||
"[[Name|Link]]", | |||
`<p><a href="`+url+`" rel="nofollow">Name</a></p>`, | |||
`<p><a href="`+urlWiki+`" rel="nofollow">Name</a></p>`) | |||
test( | |||
"[[Name|Link.jpg]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" alt="Name" title="Name"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" alt="Name" title="Name"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|alt=AltName]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" alt="AltName" title="AltName"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" alt="AltName" title="AltName"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|title=Title]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" alt="Title" title="Title"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" alt="Title" title="Title"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|alt=AltName|title=Title]]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" alt="AltName" title="Title"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" alt="AltName" title="Title"/></a></p>`) | |||
test( | |||
"[[Name|Link.jpg|alt=\"AltName\"|title='Title']]", | |||
`<p><a href="`+imgurl+`" rel="nofollow"><img src="`+imgurl+`" alt="AltName" title="Title"/></a></p>`, | |||
`<p><a href="`+imgurlWiki+`" rel="nofollow"><img src="`+imgurlWiki+`" alt="AltName" title="Title"/></a></p>`) | |||
test( | |||
"[[Link]] [[OtherLink]]", | |||
`<p><a href="`+url+`" rel="nofollow">Link</a> <a href="`+otherUrl+`" rel="nofollow">OtherLink</a></p>`, | |||
`<p><a href="`+urlWiki+`" rel="nofollow">Link</a> <a href="`+otherUrlWiki+`" rel="nofollow">OtherLink</a></p>`) | |||
} | |||
func TestMisc_IsMarkdownFile(t *testing.T) { | |||
setting.Markdown.FileExtensions = []string{".md", ".markdown", ".mdown", ".mkd"} | |||
trueTestCases := []string{ | |||
@@ -141,35 +77,11 @@ func TestRender_Images(t *testing.T) { | |||
test( | |||
"!["+title+"]("+url+")", | |||
`<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" alt="`+title+`"></a></p>`) | |||
`<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" alt="`+title+`"/></a></p>`) | |||
test( | |||
"[["+title+"|"+url+"]]", | |||
`<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" alt="`+title+`" title="`+title+`"/></a></p>`) | |||
} | |||
func TestRegExp_ShortLinkPattern(t *testing.T) { | |||
trueTestCases := []string{ | |||
"[[stuff]]", | |||
"[[]]", | |||
"[[stuff|title=Difficult name with spaces*!]]", | |||
} | |||
falseTestCases := []string{ | |||
"test", | |||
"abcdefg", | |||
"[[]", | |||
"[[", | |||
"[]", | |||
"]]", | |||
"abcdefghijklmnopqrstuvwxyz", | |||
} | |||
for _, testCase := range trueTestCases { | |||
assert.True(t, markup.ShortLinkPattern.MatchString(testCase)) | |||
} | |||
for _, testCase := range falseTestCases { | |||
assert.False(t, markup.ShortLinkPattern.MatchString(testCase)) | |||
} | |||
`<p><a href="`+result+`" rel="nofollow"><img src="`+result+`" title="`+title+`" alt="`+title+`"/></a></p>`) | |||
} | |||
func testAnswers(baseURLContent, baseURLImages string) []string { | |||
@@ -185,7 +97,7 @@ func testAnswers(baseURLContent, baseURLImages string) []string { | |||
<ul> | |||
<li>Bezier widget (by <a href="` + AppURL + `r-lyeh" rel="nofollow">@r-lyeh</a>) <a href="http://localhost:3000/ocornut/imgui/issues/786" rel="nofollow">#786</a></li> | |||
<li>Node graph editors https://github.com/ocornut/imgui/issues/306</li> | |||
<li>Node graph editors <a href="https://github.com/ocornut/imgui/issues/306" rel="nofollow">https://github.com/ocornut/imgui/issues/306</a></li> | |||
<li><a href="` + baseURLContent + `/memory_editor_example" rel="nofollow">Memory Editor</a></li> | |||
<li><a href="` + baseURLContent + `/plot_var_example" rel="nofollow">Plot var helper</a></li> | |||
</ul> | |||
@@ -201,14 +113,14 @@ func testAnswers(baseURLContent, baseURLImages string) []string { | |||
<table> | |||
<thead> | |||
<tr> | |||
<th><a href="` + baseURLImages + `/images/icon-install.png" rel="nofollow"><img src="` + baseURLImages + `/images/icon-install.png" alt="images/icon-install.png" title="icon-install.png"/></a></th> | |||
<th><a href="` + baseURLImages + `/images/icon-install.png" rel="nofollow"><img src="` + baseURLImages + `/images/icon-install.png" title="icon-install.png" alt="images/icon-install.png"/></a></th> | |||
<th><a href="` + baseURLContent + `/Installation" rel="nofollow">Installation</a></th> | |||
</tr> | |||
</thead> | |||
<tbody> | |||
<tr> | |||
<td><a href="` + baseURLImages + `/images/icon-usage.png" rel="nofollow"><img src="` + baseURLImages + `/images/icon-usage.png" alt="images/icon-usage.png" title="icon-usage.png"/></a></td> | |||
<td><a href="` + baseURLImages + `/images/icon-usage.png" rel="nofollow"><img src="` + baseURLImages + `/images/icon-usage.png" title="icon-usage.png" alt="images/icon-usage.png"/></a></td> | |||
<td><a href="` + baseURLContent + `/Usage" rel="nofollow">Usage</a></td> | |||
</tr> | |||
</tbody> | |||
@@ -218,9 +130,9 @@ func testAnswers(baseURLContent, baseURLImages string) []string { | |||
<ol> | |||
<li><a href="https://github.com/libgdx/libgdx/wiki/Gradle-on-the-Commandline#packaging-for-the-desktop" rel="nofollow">Package your libGDX application</a> | |||
<a href="` + baseURLImages + `/images/1.png" rel="nofollow"><img src="` + baseURLImages + `/images/1.png" alt="images/1.png" title="1.png"/></a></li> | |||
<a href="` + baseURLImages + `/images/1.png" rel="nofollow"><img src="` + baseURLImages + `/images/1.png" title="1.png" alt="images/1.png"/></a></li> | |||
<li>Perform a test run by hitting the Run! button. | |||
<a href="` + baseURLImages + `/images/2.png" rel="nofollow"><img src="` + baseURLImages + `/images/2.png" alt="images/2.png" title="2.png"/></a></li> | |||
<a href="` + baseURLImages + `/images/2.png" rel="nofollow"><img src="` + baseURLImages + `/images/2.png" title="2.png" alt="images/2.png"/></a></li> | |||
</ol> | |||
`, | |||
} |
@@ -7,6 +7,8 @@ package markup | |||
import ( | |||
"path/filepath" | |||
"strings" | |||
"code.gitea.io/gitea/modules/log" | |||
) | |||
// Init initialize regexps for markdown parsing | |||
@@ -69,7 +71,11 @@ func RenderWiki(filename string, rawBytes []byte, urlPrefix string, metas map[st | |||
func render(parser Parser, rawBytes []byte, urlPrefix string, metas map[string]string, isWiki bool) []byte { | |||
urlPrefix = strings.Replace(urlPrefix, " ", "+", -1) | |||
result := parser.Render(rawBytes, urlPrefix, metas, isWiki) | |||
result = PostProcess(result, urlPrefix, metas, isWiki) | |||
// TODO: one day the error should be returned. | |||
result, err := PostProcess(result, urlPrefix, metas, isWiki) | |||
if err != nil { | |||
log.Error(3, "PostProcess: %v", err) | |||
} | |||
return SanitizeBytes(result) | |||
} | |||
@@ -10,6 +10,7 @@ import ( | |||
"encoding/json" | |||
"errors" | |||
"fmt" | |||
"html" | |||
"html/template" | |||
"mime" | |||
"net/url" | |||
@@ -27,7 +28,6 @@ import ( | |||
"golang.org/x/net/html/charset" | |||
"golang.org/x/text/transform" | |||
"gopkg.in/editorconfig/editorconfig-core-go.v1" | |||
"html" | |||
) | |||
// NewFuncMap returns functions for injecting to templates | |||
@@ -280,26 +280,21 @@ func ReplaceLeft(s, old, new string) string { | |||
// RenderCommitMessage renders commit message with XSS-safe and special links. | |||
func RenderCommitMessage(msg, urlPrefix string, metas map[string]string) template.HTML { | |||
return renderCommitMessage(msg, markup.RenderIssueIndexPatternOptions{ | |||
URLPrefix: urlPrefix, | |||
Metas: metas, | |||
}) | |||
return RenderCommitMessageLink(msg, urlPrefix, "", metas) | |||
} | |||
// RenderCommitMessageLink renders commit message as a XXS-safe link to the provided | |||
// default url, handling for special links. | |||
func RenderCommitMessageLink(msg, urlPrefix string, urlDefault string, metas map[string]string) template.HTML { | |||
return renderCommitMessage(msg, markup.RenderIssueIndexPatternOptions{ | |||
DefaultURL: urlDefault, | |||
URLPrefix: urlPrefix, | |||
Metas: metas, | |||
}) | |||
} | |||
func renderCommitMessage(msg string, opts markup.RenderIssueIndexPatternOptions) template.HTML { | |||
func RenderCommitMessageLink(msg, urlPrefix, urlDefault string, metas map[string]string) template.HTML { | |||
cleanMsg := template.HTMLEscapeString(msg) | |||
fullMessage := string(markup.RenderIssueIndexPattern([]byte(cleanMsg), opts)) | |||
msgLines := strings.Split(strings.TrimSpace(fullMessage), "\n") | |||
// we can safely assume that it will not return any error, since there | |||
// shouldn't be any special HTML. | |||
fullMessage, err := markup.RenderCommitMessage([]byte(cleanMsg), urlPrefix, urlDefault, metas) | |||
if err != nil { | |||
log.Error(3, "RenderCommitMessage: %v", err) | |||
return "" | |||
} | |||
msgLines := strings.Split(strings.TrimSpace(string(fullMessage)), "\n") | |||
if len(msgLines) == 0 { | |||
return template.HTML("") | |||
} | |||
@@ -308,16 +303,13 @@ func renderCommitMessage(msg string, opts markup.RenderIssueIndexPatternOptions) | |||
// RenderCommitBody extracts the body of a commit message without its title. | |||
func RenderCommitBody(msg, urlPrefix string, metas map[string]string) template.HTML { | |||
return renderCommitBody(msg, markup.RenderIssueIndexPatternOptions{ | |||
URLPrefix: urlPrefix, | |||
Metas: metas, | |||
}) | |||
} | |||
func renderCommitBody(msg string, opts markup.RenderIssueIndexPatternOptions) template.HTML { | |||
cleanMsg := template.HTMLEscapeString(msg) | |||
fullMessage := string(markup.RenderIssueIndexPattern([]byte(cleanMsg), opts)) | |||
body := strings.Split(strings.TrimSpace(fullMessage), "\n") | |||
fullMessage, err := markup.RenderCommitMessage([]byte(cleanMsg), urlPrefix, "", metas) | |||
if err != nil { | |||
log.Error(3, "RenderCommitMessage: %v", err) | |||
return "" | |||
} | |||
body := strings.Split(strings.TrimSpace(string(fullMessage)), "\n") | |||
if len(body) == 0 { | |||
return template.HTML("") | |||
} |
@@ -771,7 +771,6 @@ function initWikiForm() { | |||
function (data) { | |||
preview.innerHTML = '<div class="markdown">' + data + '</div>'; | |||
emojify.run($('.editor-preview')[0]); | |||
$('.editor-preview').autolink(); | |||
} | |||
); | |||
}, 0); | |||
@@ -1549,7 +1548,6 @@ $(document).ready(function () { | |||
node.append('<a class="anchor" href="#' + name + '"><span class="octicon octicon-link"></span></a>'); | |||
}); | |||
}); | |||
$('.markdown').autolink(); | |||
$('.issue-checkbox').click(function() { | |||
var numChecked = $('.issue-checkbox').children('input:checked').length; |
@@ -1,21 +0,0 @@ | |||
The MIT License (MIT) | |||
Copyright (c) 2015 egoist 0x142857@gmail.com | |||
Permission is hereby granted, free of charge, to any person obtaining a copy | |||
of this software and associated documentation files (the "Software"), to deal | |||
in the Software without restriction, including without limitation the rights | |||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |||
copies of the Software, and to permit persons to whom the Software is | |||
furnished to do so, subject to the following conditions: | |||
The above copyright notice and this permission notice shall be included in | |||
all copies or substantial portions of the Software. | |||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |||
THE SOFTWARE. |
@@ -1,45 +0,0 @@ | |||
(function () { | |||
var re = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-]*)?\??(?:[\-\+:=&;%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g; | |||
function textNodesUnder(node) { | |||
var textNodes = []; | |||
if(typeof document.createTreeWalker === 'function') { | |||
// Efficient TreeWalker | |||
var currentNode, walker; | |||
walker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT, null, false); | |||
while(currentNode = walker.nextNode()) { | |||
textNodes.push(currentNode); | |||
} | |||
} else { | |||
// Less efficient recursive function | |||
for(node = node.firstChild; node; node = node.nextSibling) { | |||
if(node.nodeType === 3) { | |||
textNodes.push(node); | |||
} else { | |||
textNodes = textNodes.concat(textNodesUnder(node)); | |||
} | |||
} | |||
} | |||
return textNodes; | |||
} | |||
function processNode(node) { | |||
re.lastIndex = 0; | |||
var results = re.exec(node.textContent); | |||
if(results !== null) { | |||
if($(node).parents().filter('code').length === 0) { | |||
$(node).replaceWith( | |||
$('<span />').html( | |||
node.nodeValue.replace(re, '<a href="$1">$1</a>') | |||
) | |||
); | |||
} | |||
} | |||
} | |||
jQuery.fn.autolink = function () { | |||
this.each(function () { | |||
textNodesUnder(this).forEach(processNode); | |||
}); | |||
return this; | |||
}; | |||
})(); |
@@ -73,7 +73,7 @@ func TestAPI_RenderGFM(t *testing.T) { | |||
<ul> | |||
<li><a href="` + AppSubURL + `wiki/Links" rel="nofollow">Links, Language bindings, Engine bindings</a></li> | |||
<li><a href="` + AppSubURL + `wiki/Tips" rel="nofollow">Tips</a></li> | |||
<li>Bezier widget (by <a href="` + AppURL + `r-lyeh" rel="nofollow">@r-lyeh</a>) https://github.com/ocornut/imgui/issues/786</li> | |||
<li>Bezier widget (by <a href="` + AppURL + `r-lyeh" rel="nofollow">@r-lyeh</a>) <a href="https://github.com/ocornut/imgui/issues/786" rel="nofollow">https://github.com/ocornut/imgui/issues/786</a></li> | |||
</ul> | |||
`, | |||
// wine-staging wiki home extract: special wiki syntax, images | |||
@@ -96,7 +96,7 @@ Here are some links to the most important topics. You can find the full list of | |||
<p>Here are some links to the most important topics. You can find the full list of pages at the sidebar.</p> | |||
<p><a href="` + AppSubURL + `wiki/Configuration" rel="nofollow">Configuration</a> | |||
<a href="` + AppSubURL + `wiki/raw/images/icon-bug.png" rel="nofollow"><img src="` + AppSubURL + `wiki/raw/images/icon-bug.png" alt="images/icon-bug.png" title="icon-bug.png"/></a></p> | |||
<a href="` + AppSubURL + `wiki/raw/images/icon-bug.png" rel="nofollow"><img src="` + AppSubURL + `wiki/raw/images/icon-bug.png" title="icon-bug.png" alt="images/icon-bug.png"/></a></p> | |||
`, | |||
// Guard wiki sidebar: special syntax | |||
`[[Guardfile-DSL / Configuring-Guard|Guardfile-DSL---Configuring-Guard]]`, |
@@ -122,7 +122,6 @@ | |||
emojiTribute.attach(document.getElementById('content')) | |||
</script> | |||
{{end}} | |||
<script src="{{AppSubUrl}}/vendor/plugins/autolink/autolink.js"></script> | |||
<script src="{{AppSubUrl}}/vendor/plugins/emojify/emojify.min.js"></script> | |||
<script src="{{AppSubUrl}}/vendor/plugins/clipboard/clipboard.min.js"></script> | |||
<script src="{{AppSubUrl}}/vendor/plugins/vue/vue.min.js"></script> |