diff options
| author | guillep2k <18600385+guillep2k@users.noreply.github.com> | 2019-11-12 23:27:11 -0300 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2019-11-13 03:27:11 +0100 |
| commit | 7b97e045557788efee6803261cf612eaf975c6be (patch) | |
| tree | 338be48cbd983219854facc0578cc9e485a21d18 /modules/markup | |
| parent | cda8de2004f81169355fea24762d4f11c9e88560 (diff) | |
| download | gitea-7b97e045557788efee6803261cf612eaf975c6be.tar.gz gitea-7b97e045557788efee6803261cf612eaf975c6be.zip | |
Convert EOL to UNIX-style to render MD properly (#8925)
* Convert EOL to UNIX-style to render MD properly
* Update modules/markup/markdown/markdown.go
Co-Authored-By: zeripath <art27@cantab.net>
* Fix lint optimization
* Check for empty content before conversion
* Update modules/util/util.go
Co-Authored-By: zeripath <art27@cantab.net>
* Improved checks and tests
* Add paragraph render test
* Improve speed even more, improve tests
* Small improvement by @gary-kim
* Fix test for DOS
* More improvements
* Restart CI
Diffstat (limited to 'modules/markup')
| -rw-r--r-- | modules/markup/markdown/markdown.go | 3 | ||||
| -rw-r--r-- | modules/markup/markdown/markdown_test.go | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go index ff78d7ea3a..fc704243e2 100644 --- a/modules/markup/markdown/markdown.go +++ b/modules/markup/markdown/markdown.go @@ -157,7 +157,8 @@ func RenderRaw(body []byte, urlPrefix string, wikiMarkdown bool) []byte { exts |= blackfriday.HardLineBreak } - body = blackfriday.Run(body, blackfriday.WithRenderer(renderer), blackfriday.WithExtensions(exts)) + // Need to normalize EOL to UNIX LF to have consistent results in rendering + body = blackfriday.Run(util.NormalizeEOL(body), blackfriday.WithRenderer(renderer), blackfriday.WithExtensions(exts)) return markup.SanitizeBytes(body) } diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index b29f870ce5..e80173c6cf 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -294,3 +294,25 @@ func TestTotal_RenderString(t *testing.T) { assert.Equal(t, testCases[i+1], line) } } + +func TestRender_RenderParagraphs(t *testing.T) { + test := func(t *testing.T, str string, cnt int) { + unix := []byte(str) + res := string(RenderRaw(unix, "", false)) + assert.Equal(t, strings.Count(res, "<p"), cnt) + + mac := []byte(strings.ReplaceAll(str, "\n", "\r")) + res = string(RenderRaw(mac, "", false)) + assert.Equal(t, strings.Count(res, "<p"), cnt) + + dos := []byte(strings.ReplaceAll(str, "\n", "\r\n")) + res = string(RenderRaw(dos, "", false)) + assert.Equal(t, strings.Count(res, "<p"), cnt) + } + + test(t, "\nOne\nTwo\nThree", 1) + test(t, "\n\nOne\nTwo\nThree", 1) + test(t, "\n\nOne\nTwo\nThree\n\n\n", 1) + test(t, "A\n\nB\nC\n", 2) + test(t, "A\n\n\nB\nC\n", 2) +} |