refactor: remove class Issue

Author: netpyoung

NF.Tool.ReleaseNoteMaker/NF.Tool.ReleaseNoteMaker.Common/Fragments/IssuePart.cs

@@ -1,5 +1,4 @@
-using SmartFormat;
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -76,36 +75,4 @@ public int CompareTo(IssuePart? other)
             return a.CompareTo(b) >= 0;
         }
     }
-
-    public sealed class Issue
-    {
-        public static string RenderIssue(string issueFormat, string issue)
-        {
-            if (!string.IsNullOrEmpty(issueFormat))
-            {
-                string renderedIssue = Smart.Format(issueFormat, new { Issue = issue });
-                return renderedIssue;
-            }
-
-            if (int.TryParse(issue, out int issueNumber))
-            {
-                string renderedIssue = $"#{issueNumber}";
-                return renderedIssue;
-            }
-            return issue;
-        }
-        public static string AppendNewlinesIfTrailingCodeBlock(string text)
-        {
-            string indentedText = @"  [ \t]+[^\n]*";
-            string emptyOrIndentedTextLines = $"(({indentedText})?\n)*";
-            string regex = @"::\n\n" + emptyOrIndentedTextLines + indentedText + "$";
-            bool isTrailingCodeBlock = Regex.IsMatch(text, regex);
-            if (isTrailingCodeBlock)
-            {
-                return $"{text}\n\n ";
-            }
-
-            return text;
-        }
-    }
 }

NF.Tool.ReleaseNoteMaker/NF.Tool.ReleaseNoteMaker.Common/Template/TemplateRenderer.cs

@@ -1,12 +1,14 @@
 using NF.Tool.ReleaseNoteMaker.Common.Config;
 using NF.Tool.ReleaseNoteMaker.Common.Fragments;
+using SmartFormat;
 using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace NF.Tool.ReleaseNoteMaker.Common.Template
@@ -81,8 +83,8 @@ public sealed class TemplateRenderer
                     List<Content> contents = new List<Content>(xs.Count);
                     foreach (Content x in xs.OrderBy(EntryKey))
                     {
-                        List<string> formattedIssues = x.Issues.Select(x => Issue.RenderIssue(issueFormat, x)).ToList();
-                        string text = Issue.AppendNewlinesIfTrailingCodeBlock(x.Text);
+                        List<string> formattedIssues = x.Issues.Select(x => RenderIssue(issueFormat, x)).ToList();
+                        string text = AppendNewlinesIfTrailingCodeBlock(x.Text);
                         Content c = new Content(text, formattedIssues);
                         contents.Add(c);
                     }
@@ -99,7 +101,7 @@ public sealed class TemplateRenderer
                         string categoryDisplayName = releaseNoteTypeOrNull.DisplayName;
                         {
                             List<string> issues = grpCategory.Select(x => x.FragmentBasename.Issue).Where(x => !string.IsNullOrEmpty(x)).OrderBy(IssuePart.IssueKey).ToList();
-                            List<string> formattedIssues = issues.Select(x => Issue.RenderIssue(issueFormat, x)).ToList();
+                            List<string> formattedIssues = issues.Select(x => RenderIssue(issueFormat, x)).ToList();
                             categories.Add(new Category(categoryDisplayName, contents, formattedIssues));
                         }
                     }
@@ -222,5 +224,34 @@ internal static string TextWrap(string text, int width, string subsequentIndent)
             string ret = sb.ToString().TrimEnd();
             return ret;
         }
+
+        public static string RenderIssue(string issueFormat, string issue)
+        {
+            if (!string.IsNullOrEmpty(issueFormat))
+            {
+                string renderedIssue = Smart.Format(issueFormat, new { Issue = issue });
+                return renderedIssue;
+            }
+
+            if (int.TryParse(issue, out int issueNumber))
+            {
+                string renderedIssue = $"#{issueNumber}";
+                return renderedIssue;
+            }
+            return issue;
+        }
+        public static string AppendNewlinesIfTrailingCodeBlock(string text)
+        {
+            string indentedText = @"  [ \t]+[^\n]*";
+            string emptyOrIndentedTextLines = $"(({indentedText})?\n)*";
+            string regex = @"::\n\n" + emptyOrIndentedTextLines + indentedText + "$";
+            bool isTrailingCodeBlock = Regex.IsMatch(text, regex);
+            if (isTrailingCodeBlock)
+            {
+                return $"{text}\n\n ";
+            }
+
+            return text;
+        }
     }
 }