Зарефачить работу маркдауна в режиме plain text и добавить таблицы (#3672)

Author: leotsarev

src/JoinRpg.Markdown.Test/LinkRendererTest.cs

@@ -1,3 +1,5 @@
+using Markdig.Renderers;
+
 namespace JoinRpg.Markdown.Test;
 
 public class LinkRendererTest
@@ -8,11 +10,11 @@ private class LinkRendererMock : ILinkRenderer
 
         public string[] LinkTypesToMatch { get; } = [Test];
 
-        public string Render(string match, int index, string extra)
+        public void Render(HtmlRenderer renderer, string match, int index, string extra)
         {
             match.ShouldBe("%" + Test);
             index.ShouldBeGreaterThan(0);
-            return $"<b>{index}</b>{extra}";
+            renderer.Write($"<b>{index}</b>{extra}");
         }
     }
 
@@ -22,11 +24,11 @@ private class LinkRendererMock2 : ILinkRenderer
 
         public string[] LinkTypesToMatch { get; } = [Test];
 
-        public string Render(string match, int index, string extra)
+        public void Render(HtmlRenderer renderer, string match, int index, string extra)
         {
             match.ShouldBe("%" + Test);
             index.ShouldBeGreaterThan(0);
-            return $"<b>{index}</b>{extra}";
+            renderer.Write($"<b>{index}</b>{extra}");
         }
     }
 

src/JoinRpg.Markdown/DoNothingLinkRenderer.cs

@@ -1,3 +1,5 @@
+using Markdig.Renderers;
+
 namespace JoinRpg.Markdown;
 
 /// <summary>
@@ -9,7 +11,7 @@ internal class DoNothingLinkRenderer : ILinkRenderer
     public string[] LinkTypesToMatch { get; } = [];
 
     /// <inheritdoc />
-    public string Render(string match, int index, string extra) => throw new NotSupportedException();
+    public void Render(HtmlRenderer renderer, string match, int index, string extra) => throw new NotSupportedException();
 
     /// <summary>
     /// Instance copy to avoid allocations

src/JoinRpg.Markdown/EntityLinkerExtension.cs

@@ -49,6 +49,8 @@ private static HtmlSanitizer InitHtml5Sanitizer()
         _ = sanitizer.Tag("pre");
         _ = sanitizer.Tag("code");
         _ = sanitizer.Tag("table");
+        _ = sanitizer.Tag("thead");
+        _ = sanitizer.Tag("tbody");
         _ = sanitizer.Tag("tr");
         _ = sanitizer.Tag("td");
         _ = sanitizer.Tag("th");

src/JoinRpg.Markdown/HtmlSanitizers.cs

@@ -1,4 +1,5 @@
 namespace JoinRpg.Markdown;
+using Markdig.Renderers;
 
 /// <summary>
 /// interfaces that allows consumers to plugin its renderers
@@ -13,5 +14,5 @@ public interface ILinkRenderer
     /// <summary>
     /// Function that do actual rendering 
     /// </summary>
-    string Render(string match, int index, string extra);
+    void Render(HtmlRenderer renderer, string match, int index, string extra);
 }

src/JoinRpg.Markdown/ILinkRenderer.cs

@@ -17,6 +17,7 @@ private static MarkdownPipeline CreatePipeline()
             .UseSoftlineBreakAsHardlineBreak()
             .UseMediaLinks()
             .UseAutoLinks()
+            .UsePipeTables()
             .UseEntityLinker(["персонаж", "контакты", "группа", "список", "сеткаролей", "экспериментальнаятаблица"])
             .Build();
     }

src/JoinRpg.Markdown/LinkerRenderAdapter.cs

@@ -1,4 +1,6 @@
 using Markdig;
+using Markdig.Renderers;
+using Markdig.Renderers.Html;
 
 namespace JoinRpg.Markdown;
 
@@ -9,4 +11,18 @@ public static MarkdownPipelineBuilder UseEntityLinker(this MarkdownPipelineBuild
         pipeline.Extensions.AddIfNotAlready(new EntityLinkerExtension(prefixes));
         return pipeline;
     }
+
+    internal class EntityLinkerExtension(string[] prefixes) : IMarkdownExtension
+    {
+        private readonly string[] prefixes = prefixes;
+
+        public void Setup(MarkdownPipelineBuilder pipeline) => pipeline.InlineParsers.AddIfNotAlready(new LinkerParser(prefixes));
+
+        public void Setup(MarkdownPipeline pipeline, IMarkdownRenderer renderer) => renderer.ObjectRenderers.AddIfNotAlready(new LinkerRenderAdapter());
+
+        internal class LinkerRenderAdapter : HtmlObjectRenderer<EntityLinkInline>
+        {
+            protected override void Write(HtmlRenderer renderer, EntityLinkInline obj) => obj.Renderer.Render(renderer, obj.Match, obj.Index, obj.Extra);
+        }
+    }
 }

src/JoinRpg.Markdown/MarkDownRendererFacade.cs

@@ -12,6 +12,7 @@
 using JoinRpg.Services.Interfaces;
 using JoinRpg.Services.Interfaces.Projects;
 using JoinRpg.Web.Helpers;
+using JoinRpg.Web.Models.Helpers;
 using JoinRpg.Web.Models.Plot;
 using JoinRpg.Web.Plots;
 using JoinRpg.WebComponents.ElementMoving;
@@ -330,7 +331,7 @@ public async Task<ActionResult> ShowElementVersion(int projectId, int plotFolder
         var projectInfo = await projectMetadataRepository.GetProjectMetadata(new(projectId));
         return View(new PlotElementListItemViewModel(folder.Elements.Single(e => e.PlotElementId == plotElementId),
           CurrentUserId,
-            projectInfo, itemIdsToParticipateInSort: null, currentVersion: version, printMode: printMode));
+            itemIdsToParticipateInSort: null, renderer: new JoinrpgMarkdownLinkRenderer(folder.Project, projectInfo), currentVersion: version, printMode: printMode));
     }
 
     [HttpPost(), MasterAuthorize(Permission.CanManagePlots)]

src/JoinRpg.Markdown/MarkdownEntityLinkerExtensions.cs

@@ -1,5 +1,5 @@
 using JoinRpg.DataModel;
-using JoinRpg.Web.Helpers;
+using JoinRpg.Web.Models.Helpers;
 
 namespace JoinRpg.WebPortal.Models.Test;
 public class ContactsTests