diff --git a/src/Markdig.Tests/TestNormalize.cs b/src/Markdig.Tests/TestNormalize.cs index c33954d5..7ca5cbc4 100644 --- a/src/Markdig.Tests/TestNormalize.cs +++ b/src/Markdig.Tests/TestNormalize.cs @@ -411,6 +411,15 @@ This is a last line"; + [Test] + public void JiraLinks() + { + AssertNormalizeNoTrim("FOO-1234"); + AssertNormalizeNoTrim("AB-1"); + + AssertNormalizeNoTrim("**Hello World AB-1**"); + } + private static void AssertSyntax(string expected, MarkdownObject syntax) { var writer = new StringWriter(); @@ -441,6 +450,7 @@ This is a last line"; expected = NormText(expected, trim); var pipeline = new MarkdownPipelineBuilder() + .UseJiraLinks(new Extensions.JiraLinks.JiraLinkOptions("https://jira.example.com")) .UseTaskLists() .Build(); diff --git a/src/Markdig/Extensions/JiraLinks/JiraLinkExtension.cs b/src/Markdig/Extensions/JiraLinks/JiraLinkExtension.cs index 0c30594b..169970fa 100644 --- a/src/Markdig/Extensions/JiraLinks/JiraLinkExtension.cs +++ b/src/Markdig/Extensions/JiraLinks/JiraLinkExtension.cs @@ -1,8 +1,10 @@ -// Copyright (c) Alexandre Mutel. All rights reserved. +// Copyright (c) Alexandre Mutel. All rights reserved. // This file is licensed under the BSD-Clause 2 license. // See the license.txt file in the project root for more information. using Markdig.Parsers.Inlines; using Markdig.Renderers; +using Markdig.Renderers.Normalize.Inlines; +using Markdig.Renderers.Normalize; namespace Markdig.Extensions.JiraLinks { @@ -30,7 +32,13 @@ namespace Markdig.Extensions.JiraLinks public void Setup(MarkdownPipeline pipeline, IMarkdownRenderer renderer) { - // Nothing to setup, JiraLinks used a normal LinkInlineRenderer + // No HTML renderer required, since JiraLink type derives from InlineLink (which already has an HTML renderer) + + var normalizeRenderer = renderer as NormalizeRenderer; + if (normalizeRenderer != null && !normalizeRenderer.ObjectRenderers.Contains()) + { + normalizeRenderer.ObjectRenderers.InsertBefore(new NormalizeJiraLinksRenderer()); + } } } diff --git a/src/Markdig/Extensions/JiraLinks/NormalizeJiraLinksRenderer.cs b/src/Markdig/Extensions/JiraLinks/NormalizeJiraLinksRenderer.cs new file mode 100644 index 00000000..754bc961 --- /dev/null +++ b/src/Markdig/Extensions/JiraLinks/NormalizeJiraLinksRenderer.cs @@ -0,0 +1,18 @@ +using Markdig.Renderers.Normalize; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Markdig.Extensions.JiraLinks +{ + public class NormalizeJiraLinksRenderer : NormalizeObjectRenderer + { + protected override void Write(NormalizeRenderer renderer, JiraLink obj) + { + renderer.Write(obj.ProjectKey); + renderer.Write("-"); + renderer.Write(obj.Issue); + } + } +}