feature: subject presenter supports inline codeblock

love-linger · love-linger · commit 8c4362a98d75 · 2025-04-25T13:24:13.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
@@ -117,6 +117,6 @@ public void ParseDecorators(string data)
     public class CommitFullMessage
     {
         public string Message { get; set; } = string.Empty;
-        public List<Hyperlink> Links { get; set; } = [];
+        public List<InlineElement> Inlines { get; set; } = [];
     }
 }
diff --git a/src/Models/InlineElement.cs b/src/Models/InlineElement.cs
@@ -1,18 +1,27 @@
 ﻿namespace SourceGit.Models
 {
-    public class Hyperlink
+    public enum InlineElementType
     {
+        None = 0,
+        Keyword,
+        Link,
+        CommitSHA,
+        Code,
+    }
+
+    public class InlineElement
+    {
+        public InlineElementType Type { get; set; } = InlineElementType.None;
         public int Start { get; set; } = 0;
         public int Length { get; set; } = 0;
         public string Link { get; set; } = "";
-        public bool IsCommitSHA { get; set; } = false;
 
-        public Hyperlink(int start, int length, string link, bool isCommitSHA = false)
+        public InlineElement(InlineElementType type, int start, int length, string link)
         {
+            Type = type;
             Start = start;
             Length = length;
             Link = link;
-            IsCommitSHA = isCommitSHA;
         }
 
         public bool Intersect(int start, int length)
diff --git a/src/Models/IssueTrackerRule.cs b/src/Models/IssueTrackerRule.cs
@@ -46,7 +46,7 @@ public string URLTemplate
             set => SetProperty(ref _urlTemplate, value);
         }
 
-        public void Matches(List<Hyperlink> outs, string message)
+        public void Matches(List<InlineElement> outs, string message)
         {
             if (_regex == null || string.IsNullOrEmpty(_urlTemplate))
                 return;
@@ -81,8 +81,7 @@ public void Matches(List<Hyperlink> outs, string message)
                         link = link.Replace($"${j}", group.Value);
                 }
 
-                var range = new Hyperlink(start, len, link);
-                outs.Add(range);
+                outs.Add(new InlineElement(InlineElementType.Link, start, len, link));
             }
         }
 
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
@@ -578,10 +578,10 @@ private void Refresh()
             Task.Run(() =>
             {
                 var message = new Commands.QueryCommitFullMessage(_repo.FullPath, _commit.SHA).Result();
-                var links = ParseLinksInMessage(message);
+                var inlines = ParseInlinesInMessage(message);
 
                 if (!token.IsCancellationRequested)
-                    Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Links = links });
+                    Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Inlines = inlines });
             });
 
             Task.Run(() =>
@@ -633,13 +633,13 @@ private void Refresh()
             });
         }
 
-        private List<Models.Hyperlink> ParseLinksInMessage(string message)
+        private List<Models.InlineElement> ParseInlinesInMessage(string message)
         {
-            var links = new List<Models.Hyperlink>();
+            var inlines = new List<Models.InlineElement>();
             if (_repo.Settings.IssueTrackerRules is { Count: > 0 } rules)
             {
                 foreach (var rule in rules)
-                    rule.Matches(links, message);
+                    rule.Matches(inlines, message);
             }
 
             var matches = REG_SHA_FORMAT().Matches(message);
@@ -652,7 +652,7 @@ private void Refresh()
                 var start = match.Index;
                 var len = match.Length;
                 var intersect = false;
-                foreach (var link in links)
+                foreach (var link in inlines)
                 {
                     if (link.Intersect(start, len))
                     {
@@ -667,13 +667,13 @@ private void Refresh()
                 var sha = match.Groups[1].Value;
                 var isCommitSHA = new Commands.IsCommitSHA(_repo.FullPath, sha).Result();
                 if (isCommitSHA)
-                    links.Add(new Models.Hyperlink(start, len, sha, true));
+                    inlines.Add(new Models.InlineElement(Models.InlineElementType.CommitSHA, start, len, sha));
             }
 
-            if (links.Count > 0)
-                links.Sort((l, r) => l.Start - r.Start);
+            if (inlines.Count > 0)
+                inlines.Sort((l, r) => l.Start - r.Start);
 
-            return links;
+            return inlines;
         }
 
         private void RefreshVisibleChanges()
diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs
@@ -39,7 +39,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 if (string.IsNullOrEmpty(message))
                     return;
 
-                var links = FullMessage?.Links;
+                var links = FullMessage?.Inlines;
                 if (links == null || links.Count == 0)
                 {
                     Inlines.Add(new Run(message));
@@ -54,7 +54,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                         inlines.Add(new Run(message.Substring(pos, link.Start - pos)));
 
                     var run = new Run(message.Substring(link.Start, link.Length));
-                    run.Classes.Add(link.IsCommitSHA ? "commit_link" : "issue_link");
+                    run.Classes.Add(link.Type == Models.InlineElementType.CommitSHA ? "commit_link" : "issue_link");
                     inlines.Add(run);
 
                     pos = link.Start + link.Length;
@@ -87,7 +87,7 @@ protected override void OnPointerMoved(PointerEventArgs e)
                         scrollViewer.LineDown();
                 }
             }
-            else if (FullMessage is { Links: { Count: > 0 } links })
+            else if (FullMessage is { Inlines: { Count: > 0 } links })
             {
                 var point = e.GetPosition(this) - new Point(Padding.Left, Padding.Top);
                 var x = Math.Min(Math.Max(point.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0));
@@ -106,7 +106,7 @@ protected override void OnPointerMoved(PointerEventArgs e)
                     SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));
 
                     _lastHover = link;
-                    if (!link.IsCommitSHA)
+                    if (link.Type == Models.InlineElementType.Link)
                         ToolTip.SetTip(this, link.Link);
                     else
                         ProcessHoverCommitLink(link);
@@ -127,7 +127,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
                 var link = _lastHover.Link;
                 e.Pointer.Capture(null);
 
-                if (_lastHover.IsCommitSHA)
+                if (_lastHover.Type == Models.InlineElementType.CommitSHA)
                 {
                     var parentView = this.FindAncestorOfType<CommitBaseInfo>();
                     if (parentView is { DataContext: ViewModels.CommitDetail detail })
@@ -252,7 +252,7 @@ protected override void OnPointerExited(PointerEventArgs e)
             ClearHoveredIssueLink();
         }
 
-        private void ProcessHoverCommitLink(Models.Hyperlink link)
+        private void ProcessHoverCommitLink(Models.InlineElement link)
         {
             var sha = link.Link;
 
@@ -301,7 +301,7 @@ private void ClearHoveredIssueLink()
             }
         }
 
-        private Models.Hyperlink _lastHover = null;
+        private Models.InlineElement _lastHover = null;
         private Dictionary<string, Models.Commit> _inlineCommits = new();
     }
 }
diff --git a/src/Views/CommitSubjectPresenter.cs b/src/Views/CommitSubjectPresenter.cs
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,6 @@ public void ParseDecorators(string data)`
`117`	`117`	`public class CommitFullMessage`
`118`	`118`	`{`
`119`	`119`	`public string Message { get; set; } = string.Empty;`
`120`		`- public List<Hyperlink> Links { get; set; } = [];`
	`120`	`+ public List<InlineElement> Inlines { get; set; } = [];`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public string URLTemplate`
`46`	`46`	`set => SetProperty(ref _urlTemplate, value);`
`47`	`47`	`}`
`48`	`48`
`49`		`- public void Matches(List<Hyperlink> outs, string message)`
	`49`	`+ public void Matches(List<InlineElement> outs, string message)`
`50`	`50`	`{`
`51`	`51`	`if (_regex == null \|\| string.IsNullOrEmpty(_urlTemplate))`
`52`	`52`	`return;`
`@@ -81,8 +81,7 @@ public void Matches(List<Hyperlink> outs, string message)`
`81`	`81`	`link = link.Replace($"${j}", group.Value);`
`82`	`82`	`}`
`83`	`83`
`84`		`- var range = new Hyperlink(start, len, link);`
`85`		`- outs.Add(range);`
	`84`	`+ outs.Add(new InlineElement(InlineElementType.Link, start, len, link));`
`86`	`85`	`}`
`87`	`86`	`}`
`88`	`87`
Original file line number	Diff line number	Diff line change
`@@ -578,10 +578,10 @@ private void Refresh()`
`578`	`578`	`Task.Run(() =>`
`579`	`579`	`{`
`580`	`580`	`var message = new Commands.QueryCommitFullMessage(_repo.FullPath, _commit.SHA).Result();`
`581`		`- var links = ParseLinksInMessage(message);`
	`581`	`+ var inlines = ParseInlinesInMessage(message);`
`582`	`582`
`583`	`583`	`if (!token.IsCancellationRequested)`
`584`		`- Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Links = links });`
	`584`	`+ Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Inlines = inlines });`
`585`	`585`	`});`
`586`	`586`
`587`	`587`	`Task.Run(() =>`
`@@ -633,13 +633,13 @@ private void Refresh()`
`633`	`633`	`});`
`634`	`634`	`}`
`635`	`635`
`636`		`- private List<Models.Hyperlink> ParseLinksInMessage(string message)`
	`636`	`+ private List<Models.InlineElement> ParseInlinesInMessage(string message)`
`637`	`637`	`{`
`638`		`- var links = new List<Models.Hyperlink>();`
	`638`	`+ var inlines = new List<Models.InlineElement>();`
`639`	`639`	`if (_repo.Settings.IssueTrackerRules is { Count: > 0 } rules)`
`640`	`640`	`{`
`641`	`641`	`foreach (var rule in rules)`
`642`		`- rule.Matches(links, message);`
	`642`	`+ rule.Matches(inlines, message);`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`var matches = REG_SHA_FORMAT().Matches(message);`
`@@ -652,7 +652,7 @@ private void Refresh()`
`652`	`652`	`var start = match.Index;`
`653`	`653`	`var len = match.Length;`
`654`	`654`	`var intersect = false;`
`655`		`- foreach (var link in links)`
	`655`	`+ foreach (var link in inlines)`
`656`	`656`	`{`
`657`	`657`	`if (link.Intersect(start, len))`
`658`	`658`	`{`
`@@ -667,13 +667,13 @@ private void Refresh()`
`667`	`667`	`var sha = match.Groups[1].Value;`
`668`	`668`	`var isCommitSHA = new Commands.IsCommitSHA(_repo.FullPath, sha).Result();`
`669`	`669`	`if (isCommitSHA)`
`670`		`- links.Add(new Models.Hyperlink(start, len, sha, true));`
	`670`	`+ inlines.Add(new Models.InlineElement(Models.InlineElementType.CommitSHA, start, len, sha));`
`671`	`671`	`}`
`672`	`672`
`673`		`- if (links.Count > 0)`
`674`		`- links.Sort((l, r) => l.Start - r.Start);`
	`673`	`+ if (inlines.Count > 0)`
	`674`	`+ inlines.Sort((l, r) => l.Start - r.Start);`
`675`	`675`
`676`		`- return links;`
	`676`	`+ return inlines;`
`677`	`677`	`}`
`678`	`678`
`679`	`679`	`private void RefreshVisibleChanges()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang`
`39`	`39`	`if (string.IsNullOrEmpty(message))`
`40`	`40`	`return;`
`41`	`41`
`42`		`- var links = FullMessage?.Links;`
	`42`	`+ var links = FullMessage?.Inlines;`
`43`	`43`	`if (links == null \|\| links.Count == 0)`
`44`	`44`	`{`
`45`	`45`	`Inlines.Add(new Run(message));`
`@@ -54,7 +54,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang`
`54`	`54`	`inlines.Add(new Run(message.Substring(pos, link.Start - pos)));`
`55`	`55`
`56`	`56`	`var run = new Run(message.Substring(link.Start, link.Length));`
`57`		`- run.Classes.Add(link.IsCommitSHA ? "commit_link" : "issue_link");`
	`57`	`+ run.Classes.Add(link.Type == Models.InlineElementType.CommitSHA ? "commit_link" : "issue_link");`
`58`	`58`	`inlines.Add(run);`
`59`	`59`
`60`	`60`	`pos = link.Start + link.Length;`
`@@ -87,7 +87,7 @@ protected override void OnPointerMoved(PointerEventArgs e)`
`87`	`87`	`scrollViewer.LineDown();`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`- else if (FullMessage is { Links: { Count: > 0 } links })`
	`90`	`+ else if (FullMessage is { Inlines: { Count: > 0 } links })`
`91`	`91`	`{`
`92`	`92`	`var point = e.GetPosition(this) - new Point(Padding.Left, Padding.Top);`
`93`	`93`	`var x = Math.Min(Math.Max(point.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0));`
`@@ -106,7 +106,7 @@ protected override void OnPointerMoved(PointerEventArgs e)`
`106`	`106`	`SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));`
`107`	`107`
`108`	`108`	`_lastHover = link;`
`109`		`- if (!link.IsCommitSHA)`
	`109`	`+ if (link.Type == Models.InlineElementType.Link)`
`110`	`110`	`ToolTip.SetTip(this, link.Link);`
`111`	`111`	`else`
`112`	`112`	`ProcessHoverCommitLink(link);`
`@@ -127,7 +127,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)`
`127`	`127`	`var link = _lastHover.Link;`
`128`	`128`	`e.Pointer.Capture(null);`
`129`	`129`
`130`		`- if (_lastHover.IsCommitSHA)`
	`130`	`+ if (_lastHover.Type == Models.InlineElementType.CommitSHA)`
`131`	`131`	`{`
`132`	`132`	`var parentView = this.FindAncestorOfType<CommitBaseInfo>();`
`133`	`133`	`if (parentView is { DataContext: ViewModels.CommitDetail detail })`
`@@ -252,7 +252,7 @@ protected override void OnPointerExited(PointerEventArgs e)`
`252`	`252`	`ClearHoveredIssueLink();`
`253`	`253`	`}`
`254`	`254`
`255`		`- private void ProcessHoverCommitLink(Models.Hyperlink link)`
	`255`	`+ private void ProcessHoverCommitLink(Models.InlineElement link)`
`256`	`256`	`{`
`257`	`257`	`var sha = link.Link;`
`258`	`258`
`@@ -301,7 +301,7 @@ private void ClearHoveredIssueLink()`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`
`304`		`- private Models.Hyperlink _lastHover = null;`
	`304`	`+ private Models.InlineElement _lastHover = null;`
`305`	`305`	`private Dictionary<string, Models.Commit> _inlineCommits = new();`
`306`	`306`	`}`
`307`	`307`	`}`