actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2025-04-24 05:42:40 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #270 from bernd/fix/ac-tag-escaping

Browse Source 
Fix "<ac:*>" tag rendering
This commit is contained in:
Manuel Rüger 2023-03-30 15:01:03 +02:00 committed by GitHub
commit a60dd52442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/mark/markdown.go
View File

@ -437,14 +437,14 @@ func (r *ConfluenceRenderer) renderCodeBlock(writer util.BufWriter, source []byt
func CompileMarkdown(markdown []byte, stdlib *stdlib.Lib) string { func CompileMarkdown(markdown []byte, stdlib *stdlib.Lib) string {
log.Tracef(nil, "rendering markdown:\n%s", string(markdown)) log.Tracef(nil, "rendering markdown:\n%s", string(markdown))
colon := regexp.MustCompile(`---bf-COLON---`) colon := []byte("---bf-COLON---")
tags := regexp.MustCompile(`<(/?ac):(\S+?)>`) tags := regexp.MustCompile(`</?ac:[^>]+>`)
markdown = tags.ReplaceAll( for _, match := range tags.FindAll(markdown, -1) {
markdown, // Replace the colon in all "<ac:*>" tags with the colon bytes to avoid having Goldmark escape the HTML output.
[]byte(`<$1`+colon.String()+`$2>`), markdown = bytes.ReplaceAll(markdown, match, bytes.ReplaceAll(match, []byte(":"), colon))
) }
converter := goldmark.New( converter := goldmark.New(
goldmark.WithExtensions( goldmark.WithExtensions(
@ -472,7 +472,8 @@ func CompileMarkdown(markdown []byte, stdlib *stdlib.Lib) string {
panic(err) panic(err)
} }
html := colon.ReplaceAll(buf.Bytes(), []byte(`:`)) // Restore all the colons we previously replaced.
html := bytes.ReplaceAll(buf.Bytes(), colon, []byte(":"))
log.Tracef(nil, "rendered markdown to html:\n%s", string(html)) log.Tracef(nil, "rendered markdown to html:\n%s", string(html))

6
pkg/mark/testdata/macro-include.html vendored Normal file
View File

@ -0,0 +1,6 @@
<p><foo>bar</foo></p>
<ac:structured-macro ac:name="info">
<ac:parameter ac:name="icon">true</ac:parameter>
<ac:parameter ac:name="title">Attention</ac:parameter>
<ac:rich-text-body>This is an info!</ac:rich-text-body>
</ac:structured-macro>

7
pkg/mark/testdata/macro-include.md vendored Normal file
View File

@ -0,0 +1,7 @@
<foo>bar</foo>
<ac:structured-macro ac:name="info">
<ac:parameter ac:name="icon">true</ac:parameter>
<ac:parameter ac:name="title">Attention</ac:parameter>
<ac:rich-text-body>This is an info!</ac:rich-text-body>
</ac:structured-macro>