From 9723eda455673df711b21d4f365b1c8cdc5090a9 Mon Sep 17 00:00:00 2001 From: Michael Naumov Date: Tue, 7 Jun 2022 14:02:40 -0600 Subject: [PATCH 1/2] More accurate check for YAML renderers --- src/Markdig/Extensions/Yaml/YamlFrontMatterExtension.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Markdig/Extensions/Yaml/YamlFrontMatterExtension.cs b/src/Markdig/Extensions/Yaml/YamlFrontMatterExtension.cs index f8144f5e..e20cb0f3 100644 --- a/src/Markdig/Extensions/Yaml/YamlFrontMatterExtension.cs +++ b/src/Markdig/Extensions/Yaml/YamlFrontMatterExtension.cs @@ -25,7 +25,11 @@ namespace Markdig.Extensions.Yaml { if (!renderer.ObjectRenderers.Contains()) { - renderer.ObjectRenderers.InsertBefore (new YamlFrontMatterHtmlRenderer()); + renderer.ObjectRenderers.InsertBefore(new YamlFrontMatterHtmlRenderer()); + } + + if (!renderer.ObjectRenderers.Contains()) + { renderer.ObjectRenderers.InsertBefore(new YamlFrontMatterRoundtripRenderer()); } } From 5b6621d7293be4ef12f68e0442d8436984cae71b Mon Sep 17 00:00:00 2001 From: Michael Naumov Date: Tue, 7 Jun 2022 15:06:14 -0600 Subject: [PATCH 2/2] Add tests to cover all possible cases of adding Yaml renderers --- .../TestYamlFrontMatterExtension.cs | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 src/Markdig.Tests/TestYamlFrontMatterExtension.cs diff --git a/src/Markdig.Tests/TestYamlFrontMatterExtension.cs b/src/Markdig.Tests/TestYamlFrontMatterExtension.cs new file mode 100644 index 00000000..b5bec9a9 --- /dev/null +++ b/src/Markdig.Tests/TestYamlFrontMatterExtension.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Markdig.Extensions.Yaml; +using Markdig.Renderers; +using Markdig.Syntax; +using NUnit.Framework; + +namespace Markdig.Tests +{ + public class TestYamlFrontMatterExtension + { + [TestCaseSource(nameof(TestCases))] + public void ProperYamlFrontMatterRenderersAdded(IMarkdownObjectRenderer[] objectRenderers, bool hasYamlFrontMatterHtmlRenderer, bool hasYamlFrontMatterRoundtripRenderer) + { + var builder = new MarkdownPipelineBuilder(); + builder.Extensions.Add(new YamlFrontMatterExtension()); + var markdownRenderer = new DummyRenderer(); + markdownRenderer.ObjectRenderers.AddRange(objectRenderers); + builder.Build().Setup(markdownRenderer); + Assert.That(markdownRenderer.ObjectRenderers.Contains(), Is.EqualTo(hasYamlFrontMatterHtmlRenderer)); + Assert.That(markdownRenderer.ObjectRenderers.Contains(), Is.EqualTo(hasYamlFrontMatterRoundtripRenderer)); + } + + private static IEnumerable TestCases() + { + yield return new TestCaseData(new IMarkdownObjectRenderer[] + { + }, false, false) {TestName = "No ObjectRenderers"}; + + yield return new TestCaseData(new IMarkdownObjectRenderer[] + { + new Markdig.Renderers.Html.CodeBlockRenderer() + }, true, false) {TestName = "Html CodeBlock"}; + + yield return new TestCaseData(new IMarkdownObjectRenderer[] + { + new Markdig.Renderers.Roundtrip.CodeBlockRenderer() + }, false, true) {TestName = "Roundtrip CodeBlock"}; + + yield return new TestCaseData(new IMarkdownObjectRenderer[] + { + new Markdig.Renderers.Html.CodeBlockRenderer(), + new Markdig.Renderers.Roundtrip.CodeBlockRenderer() + }, true, true) {TestName = "Html/Roundtrip CodeBlock"}; + + yield return new TestCaseData(new IMarkdownObjectRenderer[] + { + new Markdig.Renderers.Html.CodeBlockRenderer(), + new Markdig.Renderers.Roundtrip.CodeBlockRenderer(), + new YamlFrontMatterHtmlRenderer() + }, true, true) {TestName = "Html/Roundtrip CodeBlock, Yaml Html"}; + + yield return new TestCaseData(new IMarkdownObjectRenderer[] + { + new Markdig.Renderers.Html.CodeBlockRenderer(), + new Markdig.Renderers.Roundtrip.CodeBlockRenderer(), + new YamlFrontMatterRoundtripRenderer() + }, true, true) { TestName = "Html/Roundtrip CodeBlock, Yaml Roundtrip" }; + } + + private class DummyRenderer : IMarkdownRenderer + { + public DummyRenderer() + { + ObjectRenderers = new ObjectRendererCollection(); + } + + public event Action ObjectWriteBefore; + public event Action ObjectWriteAfter; + public ObjectRendererCollection ObjectRenderers { get; } + public object Render(MarkdownObject markdownObject) + { + return null; + } + } + } +}