From 8883d5e2d1839056234d402bfb9188d7d64eeb93 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 4 Jun 2021 15:21:44 +0700
Subject: [PATCH] use heading block to get title string

---
 osu.Game/Overlays/Wiki/WikiArticlePage.cs |  7 ++----
 osu.Game/Overlays/Wiki/WikiSidebar.cs     | 26 ++++++++++++++++++++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Wiki/WikiArticlePage.cs b/osu.Game/Overlays/Wiki/WikiArticlePage.cs
index a60bebdc4b..83a61db88d 100644
--- a/osu.Game/Overlays/Wiki/WikiArticlePage.cs
+++ b/osu.Game/Overlays/Wiki/WikiArticlePage.cs
@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using Markdig.Syntax;
-using Markdig.Syntax.Inlines;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
@@ -62,14 +60,13 @@ namespace osu.Game.Overlays.Wiki
 
         private class ArticleMarkdownContainer : WikiMarkdownContainer
         {
-            public Action<string, MarkdownHeading, int> OnAddHeading;
+            public Action<HeadingBlock, MarkdownHeading> OnAddHeading;
 
             protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock)
             {
                 var heading = base.CreateHeading(headingBlock);
-                var title = ((LiteralInline)headingBlock.Inline.First(i => i is LiteralInline)).Content.ToString();
 
-                OnAddHeading(title, heading, headingBlock.Level);
+                OnAddHeading(headingBlock, heading);
 
                 return heading;
             }
diff --git a/osu.Game/Overlays/Wiki/WikiSidebar.cs b/osu.Game/Overlays/Wiki/WikiSidebar.cs
index d91076e40a..0db4d41b8b 100644
--- a/osu.Game/Overlays/Wiki/WikiSidebar.cs
+++ b/osu.Game/Overlays/Wiki/WikiSidebar.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Markdig.Syntax;
+using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -38,17 +40,35 @@ namespace osu.Game.Overlays.Wiki
             },
         };
 
-        public void AddToc(string title, MarkdownHeading heading, int level)
+        public void AddToc(HeadingBlock headingBlock, MarkdownHeading heading)
         {
-            switch (level)
+            switch (headingBlock.Level)
             {
                 case 2:
                 case 3:
-                    tableOfContents.Add(new TocTitle(title, heading, level == 3));
+                    string title = getTitle(headingBlock.Inline);
+                    tableOfContents.Add(new TocTitle(title, heading, headingBlock.Level == 3));
                     break;
             }
         }
 
+        private string getTitle(ContainerInline containerInline)
+        {
+            foreach (var inline in containerInline)
+            {
+                switch (inline)
+                {
+                    case LiteralInline literalInline:
+                        return literalInline.Content.ToString();
+
+                    case LinkInline { IsImage: false } linkInline:
+                        return getTitle(linkInline);
+                }
+            }
+
+            return string.Empty;
+        }
+
         private class TocTitle : OsuHoverContainer
         {
             [Resolved]