Update Markdig to 1.4.2, fix Markdown rendering, and test Native AOT

Directory.Packages.props

@@ -37,7 +37,7 @@
     <PackageVersion Include="ColorHelper" Version="1.8.1" />
     <PackageVersion Include="TextMateSharp" Version="2.0.4" />
     <PackageVersion Include="TextMateSharp.Grammars" Version="2.0.4" />
-    <PackageVersion Include="Markdig" Version="1.4.0" />
+    <PackageVersion Include="Markdig" Version="1.4.2" />
     <PackageVersion Include="Serilog" Version="4.4.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />

Terminal.Gui/Drawing/Markdown/MarkdownAttributeHelper.cs

@@ -27,6 +27,13 @@ internal static class MarkdownAttributeHelper
     /// </param>
     /// <returns>A fully resolved <see cref="Attribute"/> ready for drawing.</returns>
     public static Attribute GetAttributeForSegment (View view, StyledSegment segment, ISyntaxHighlighter? highlighter = null, Color? themeBackground = null)
+    {
+        Attribute attribute = ResolveSegmentAttribute (view, segment, highlighter, themeBackground);
+
+        return attribute with { Style = attribute.Style | segment.AdditionalStyle };
+    }
+
+    private static Attribute ResolveSegmentAttribute (View view, StyledSegment segment, ISyntaxHighlighter? highlighter, Color? themeBackground)
     {
         if (segment.Role is { } role)
         {
@@ -116,7 +123,7 @@ public static List<StyledSegment> ToStyledSegments (IReadOnlyList<InlineRun> run
 
         foreach (InlineRun run in runs)
         {
-            segments.Add (new StyledSegment (run.Text, run.StyleRole, run.Url, run.ImageSource, run.Attribute, run.Role));
+            segments.Add (run.ToStyledSegment ());
         }
 
         return segments;

Terminal.Gui/Drawing/Markdown/StyledSegment.cs

@@ -61,4 +61,13 @@ public StyledSegment (
     ///     if the role should be resolved from <see cref="StyleRole"/>.
     /// </summary>
     public VisualRole? Role { get; }
+
+    // Preserve nested Markdown styles without fixing colors before the view's scheme is resolved.
+    internal TextStyle AdditionalStyle { get; init; }
+
+    internal StyledSegment WithText (string text, VisualRole? role = null) =>
+        new (text, StyleRole, Url, ImageSource, Attribute, role ?? Role)
+        {
+            AdditionalStyle = AdditionalStyle
+        };
 }

Terminal.Gui/Views/CodeRoleLegendHighlighter.cs

@@ -41,7 +41,7 @@ public IReadOnlyList<StyledSegment> Highlight (string code, string? language)
 
     public Attribute? GetAttributeForScope (MarkdownStyleRole role) => _textMate.GetAttributeForScope (role);
 
-    private static void AddRoleSegments (List<StyledSegment> segments, StyledSegment segment)
+    internal static void AddRoleSegments (List<StyledSegment> segments, StyledSegment segment)
     {
         int index = 0;
 
@@ -77,6 +77,6 @@ private static (string Text, VisualRole Role) FindRoleMarker (string text, int i
 
     private static void AddSegment (List<StyledSegment> segments, StyledSegment source, string text, VisualRole? role)
     {
-        segments.Add (new StyledSegment (text, source.StyleRole, source.Url, source.ImageSource, source.Attribute, role));
+        segments.Add (source.WithText (text, role));
     }
 }

Terminal.Gui/Views/Markdown/InlineRun.cs

@@ -1,17 +1,24 @@
 namespace Terminal.Gui.Views;
 
-internal sealed class InlineRun (
-    string text,
-    MarkdownStyleRole styleRole,
-    string? url = null,
-    string? imageSource = null,
-    Attribute? attribute = null,
-    VisualRole? role = null)
+internal sealed record InlineRun (
+    string Text,
+    MarkdownStyleRole StyleRole,
+    string? Url = null,
+    string? ImageSource = null,
+    Attribute? Attribute = null,
+    VisualRole? Role = null)
 {
-    public string Text { get; } = text;
-    public MarkdownStyleRole StyleRole { get; } = styleRole;
-    public string? Url { get; } = url;
-    public string? ImageSource { get; } = imageSource;
-    public Attribute? Attribute { get; } = attribute;
-    public VisualRole? Role { get; } = role;
+    public TextStyle AdditionalStyle { get; init; }
+
+    public StyledSegment ToStyledSegment (string? text = null) =>
+        new (text ?? Text, StyleRole, Url, ImageSource, Attribute, Role)
+        {
+            AdditionalStyle = AdditionalStyle
+        };
+
+    public static InlineRun FromStyledSegment (StyledSegment segment) =>
+        new (segment.Text, segment.StyleRole, segment.Url, segment.ImageSource, segment.Attribute, segment.Role)
+        {
+            AdditionalStyle = segment.AdditionalStyle
+        };
 }

Terminal.Gui/Views/Markdown/IntermediateBlock.cs

@@ -8,18 +8,23 @@ internal sealed class IntermediateBlock (IReadOnlyList<InlineRun> runs,
                                          string? anchor = null,
                                          bool isThematicBreak = false,
                                          TableData? tableData = null,
-                                         string? language = null)
+                                         string? language = null,
+                                         MarkdownTableContent? tableContent = null,
+                                         string? sourceText = null)
 {
     public IReadOnlyList<InlineRun> Runs { get; } = runs;
     public bool Wrap { get; } = wrap;
     public string Prefix { get; } = prefix;
+    public string? SourceText { get; } = sourceText;
     public string ContinuationPrefix { get; } = continuationPrefix;
     public bool IsCodeBlock { get; } = isCodeBlock;
     public bool IsThematicBreak { get; } = isThematicBreak;
 
     /// <summary>Gets the parsed table data if this block represents a table; otherwise <see langword="null"/>.</summary>
     public TableData? TableData { get; } = tableData;
 
+    public MarkdownTableContent? TableContent { get; } = tableContent;
+
     /// <summary>Gets whether this block represents a Markdown table.</summary>
     public bool IsTable => TableData is { };
 

Terminal.Gui/Views/Markdown/Markdown.cs

@@ -532,6 +532,8 @@ bool IDesignable.EnableForDesign ()
                                                           * [Basic Formatting](#basic-formatting)
                                                           * [Links](#links)
                                                           * [Checklist](#checklist)
+                                                          * [Definition Lists](#definition-lists)
+                                                          * [Hard Line Breaks](#hard-line-breaks)
                                                           * [Code Blocks](#code-blocks)
                                                           * [Tables](#tables)
                                                           * [Separators](#separators)
@@ -588,6 +590,9 @@ Plain text. *Formatted text* with **bold** and `inline code`.
                                                           | [Links](https://tui-cs.github.io/Terminal.Gui/api/Terminal.Gui.Views.MarkdownTable.html) | ✅ Totally! |
                                                           | Inline `code`  | ✅ *Awesome!*   |
                                                           | Emojis 🎉      | ✅ **Whoa!**      |
+                                                          | Code with a backtick | ``a`b`` |
+                                                          | Nested formatting | **bold *and italic*** with ~~strikethrough~~ |
+                                                          | Nested link label | [Testing [Header]](https://example.com/path_(part)) |
 
                                                           **table** with different alignments:
 
@@ -608,13 +613,26 @@ And this text is after. Thematic breaks are rendered as full-width horizontal li
 
                                                           > **Tip:** This is a block quote with *inline formatting*.
 
+                                                          > [!WARNING]
+                                                          > Alert kinds remain visible alongside their content.
+
                                                           Here's a multi-line block quote with a link, code, and more:
 
                                                           > **Tip:** Block quotes can contain *inline formatting*, **bold text**,
                                                           > `inline code`, and [links](https://example.com).
                                                           >
                                                           > They can also span multiple lines with blank quote lines between paragraphs.
 
+                                                          ## Definition Lists
+
+                                                          Terminal.Gui
+                                                          : A toolkit for terminal user interfaces.
+
+                                                          ## Hard Line Breaks
+
+                                                          This line ends with a backslash.\
+                                                          This starts on a new line without a new paragraph.
+
                                                           That's all folks! 👋
                                                           """;
 }