Rename labs-discussion/issue fields in YAML Frontmatter to discussion/issue-id instead

Author: michael-hawker

CommunityToolkit.Labs.Core.SourceGenerators.Tests/CommunityToolkit.Labs.Core.SourceGenerators.Tests/ToolkitSampleMetadataTests.Documentation.cs

@@ -48,8 +48,8 @@ Without any front matter.
     [DataRow(4, DisplayName = "Keywords")]
     [DataRow(7, DisplayName = "Category")]
     [DataRow(8, DisplayName = "Subcategory")]
-    [DataRow(9, DisplayName = "Labs Discussion")]
-    [DataRow(10, DisplayName = "Labs Issue")]
+    [DataRow(9, DisplayName = "GitHub Discussion Id")]
+    [DataRow(10, DisplayName = "GitHub Issue Id")]
     [TestMethod]
     public void MissingFrontMatterField(int removeline)
     {
@@ -62,8 +62,8 @@ public void MissingFrontMatterField(int removeline)
     - csharp
 category: Controls
 subcategory: Layout
-labs-discussion: 0
-labs-issue: 0
+discussion-id: 0
+issue-id: 0
 ---
 # This is some test documentation...
 > [!SAMPLE Sample]
@@ -89,8 +89,8 @@ public void MarkdownInvalidSampleReference()
     - csharp
 category: Controls
 subcategory: Layout
-labs-discussion: 0
-labs-issue: 0
+discussion-id: 0
+issue-id: 0
 ---
 # This is some test documentation...
 > [!SAMPLE SampINVALIDle]
@@ -114,8 +114,8 @@ public void DocumentationMissingSample()
     - csharp
 category: Controls
 subcategory: Layout
-labs-discussion: 0
-labs-issue: 0
+discussion-id: 0
+issue-id: 0
 ---
 # This is some test documentation...
 Without any sample.";
@@ -137,8 +137,8 @@ public void DocumentationValid()
     - csharp
 category: Controls
 subcategory: Layout
-labs-discussion: 0
-labs-issue: 0
+discussion-id: 0
+issue-id: 0
 ---
 # This is some test documentation...
 Which is valid.
@@ -159,8 +159,8 @@ public void DocumentationInvalidDiscussionId()
     - csharp
 category: Controls
 subcategory: Layout
-labs-discussion: https://github.com/1234
-labs-issue: 0
+discussion-id: https://github.com/1234
+issue-id: 0
 ---
 # This is some test documentation...
 Without an invalid discussion id.";
@@ -182,8 +182,8 @@ public void DocumentationInvalidIssueId()
     - csharp
 category: Controls
 subcategory: Layout
-labs-discussion: 0
-labs-issue: https://github.com/1234
+discussion-id: 0
+issue-id: https://github.com/1234
 ---
 # This is some test documentation...
 Without an invalid discussion id.";

CommunityToolkit.Labs.Core.SourceGenerators/ToolkitSampleMetadataGenerator.Documentation.cs

@@ -29,10 +29,10 @@ public partial class ToolkitSampleMetadataGenerator
     private const string FrontMatterRegexSubcategoryExpression = @"^subcategory:\s*(?<subcategory>.*)$";
     private static readonly Regex FrontMatterRegexSubcategory = new Regex(FrontMatterRegexSubcategoryExpression, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline);
 
-    private const string FrontMatterRegexDiscussionIdExpression = @"^labs-discussion:\s*(?<discussionId>.*)$";
+    private const string FrontMatterRegexDiscussionIdExpression = @"^discussion-id:\s*(?<discussionid>.*)$";
     private static readonly Regex FrontMatterRegexDiscussionId = new Regex(FrontMatterRegexDiscussionIdExpression, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline);
 
-    private const string FrontMatterRegexIssueIdExpression = @"^labs-issue:\s*(?<issueId>.*)$";
+    private const string FrontMatterRegexIssueIdExpression = @"^issue-id:\s*(?<issueid>.*)$";
     private static readonly Regex FrontMatterRegexIssueId = new Regex(FrontMatterRegexIssueIdExpression, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline);
 
     private const string MarkdownRegexSampleTagExpression = @"^>\s*\[!SAMPLE\s*(?<sampleid>.*)\s*\]\s*$";
@@ -111,8 +111,9 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu
                 var category = ParseYamlField(ref ctx, file.Path, ref frontmatter, FrontMatterRegexCategory, "category");
                 var subcategory = ParseYamlField(ref ctx, file.Path, ref frontmatter, FrontMatterRegexSubcategory, "subcategory");
 
-                var discussion = ParseYamlField(ref ctx, file.Path, ref frontmatter, FrontMatterRegexDiscussionId, "discussionId")?.Trim();
-                var issue = ParseYamlField(ref ctx, file.Path, ref frontmatter, FrontMatterRegexIssueId, "issueId")?.Trim();
+                // TODO: Should these just be optional?
+                var discussion = ParseYamlField(ref ctx, file.Path, ref frontmatter, FrontMatterRegexDiscussionId, "discussionid")?.Trim();
+                var issue = ParseYamlField(ref ctx, file.Path, ref frontmatter, FrontMatterRegexIssueId, "issueid")?.Trim();
 
                 // Check we have all the fields we expect to continue (errors will have been spit out otherwise already from the ParseYamlField method)
                 if (title == null || description == null || keywords == null ||
@@ -175,7 +176,7 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu
                             DiagnosticDescriptors.MarkdownYAMLFrontMatterException,
                             Location.Create(file.Path, TextSpan.FromBounds(0, 1), new LinePositionSpan(LinePosition.Zero, LinePosition.Zero)),
                             file.Path,
-                            "Can't parse labs-discussion field, must be a positive integer or zero."));
+                            "Can't parse discussion-id field, must be a positive integer or zero."));
                     return null;
                 }
 
@@ -186,7 +187,7 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu
                             DiagnosticDescriptors.MarkdownYAMLFrontMatterException,
                             Location.Create(file.Path, TextSpan.FromBounds(0, 1), new LinePositionSpan(LinePosition.Zero, LinePosition.Zero)),
                             file.Path,
-                            "Can't parse labs-issue field, must be a positive integer or zero."));
+                            "Can't parse issue-id field, must be a positive integer or zero."));
                     return null;
                 }