From 80d906417c230c86e539e3765b36df6a6ae37af8 Mon Sep 17 00:00:00 2001
From: Bernd Ahlers <bernd@graylog.com>
Date: Fri, 31 Mar 2023 11:09:58 +0200
Subject: [PATCH] Fix custom link renderer and add tests for Confluence links

Since we now have a custom parser for <ac:*/> tags, the custom link
renderer added an additional </a> tag at the end of each internal
Confluence link.

Add tests for internal links and add an example for internal links with
spaces in page titles to the README file.
---
 README.md                    | 2 ++
 pkg/mark/markdown.go         | 3 +--
 pkg/mark/testdata/links.html | 4 ++++
 pkg/mark/testdata/links.md   | 8 ++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 78cb49a..c8f3b8f 100644
--- a/README.md
+++ b/README.md
@@ -517,6 +517,8 @@ See task MYJIRA-123.
 This is a [link to an existing confluence page](ac:Pagetitle)
 
 And this is how to link when the linktext is the same as the [Pagetitle](ac:)
+
+Link to a [page title with space](<ac:With Space>)
 ```
 
 ### Add width for an image
diff --git a/pkg/mark/markdown.go b/pkg/mark/markdown.go
index 3c44ab8..680375d 100644
--- a/pkg/mark/markdown.go
+++ b/pkg/mark/markdown.go
@@ -276,9 +276,8 @@ func (r *ConfluenceRenderer) renderLink(writer util.BufWriter, source []byte, no
 			if err != nil {
 				return ast.WalkStop, err
 			}
-
-			return ast.WalkSkipChildren, nil
 		}
+		return ast.WalkSkipChildren, nil
 	}
 	return r.goldmarkRenderLink(writer, source, node, entering)
 }
diff --git a/pkg/mark/testdata/links.html b/pkg/mark/testdata/links.html
index 3b1f468..625f00e 100644
--- a/pkg/mark/testdata/links.html
+++ b/pkg/mark/testdata/links.html
@@ -1,5 +1,9 @@
 <p>Use <a href="https://example.com">https://example.com</a></p>
 <p>Use <ac:rich-text-body>aaa</ac:rich-text-body></p>
+<p>Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link></p>
+<p>Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link></p>
+<p>Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
+<p>Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link></p>
 <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
 <div class="footnotes" role="doc-endnotes">
 <hr />
diff --git a/pkg/mark/testdata/links.md b/pkg/mark/testdata/links.md
index f814795..ce4a282 100644
--- a/pkg/mark/testdata/links.md
+++ b/pkg/mark/testdata/links.md
@@ -2,5 +2,13 @@ Use <https://example.com>
 
 Use <ac:rich-text-body>aaa</ac:rich-text-body>
 
+Use [page link](ac:Page)
+
+Use [AnotherPage](ac:)
+
+Use [Another Page](ac:)
+
+Use [page link with spaces](<ac:Page With Space>)
+
 Use footnotes link [^1]  
 [^1]: a footnote link
\ No newline at end of file