Merge pull request #31 from windows-toolkit/bugfix/issue-30

Sergio0694 · web-flow · commit b3536df46ffa · 2021-03-03T23:19:39.000+01:00
Fixed regex parsing with sharp symbols
diff --git a/samples/MvvmSampleUwp/MvvmSampleUwp/Helpers/MarkdownHelper.cs b/samples/MvvmSampleUwp/MvvmSampleUwp/Helpers/MarkdownHelper.cs
@@ -21,10 +21,10 @@ public static class MarkdownHelper
         public static IReadOnlyDictionary<string, string> GetParagraphs(string text)
         {
             return
-                Regex.Matches(text, @"(#+ ([^\n]+)[^#]+)", RegexOptions.Singleline)
+                Regex.Matches(text, @"(?<=\W)#+ ([^\n]+).+?(?=\W#|$)", RegexOptions.Singleline)
                 .ToDictionary(
-                    m => m.Groups[2].Value.Trim().Replace("&lt;", "<"),
-                    m => m.Groups[1].Value.Trim().Replace("&lt;", "<").Replace("[!WARNING]", "**WARNING:**"));
+                    m => m.Groups[1].Value.Trim().Replace("&lt;", "<"),
+                    m => m.Groups[0].Value.Trim().Replace("&lt;", "<").Replace("[!WARNING]", "**WARNING:**").Replace("[!NOTE]", "**NOTE:**"));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ public static class MarkdownHelper`
`21`	`21`	`public static IReadOnlyDictionary<string, string> GetParagraphs(string text)`
`22`	`22`	`{`
`23`	`23`	`return`
`24`		`- Regex.Matches(text, @"(#+ ([^\n]+)[^#]+)", RegexOptions.Singleline)`
	`24`	`+ Regex.Matches(text, @"(?<=\W)#+ ([^\n]+).+?(?=\W#\|$)", RegexOptions.Singleline)`
`25`	`25`	`.ToDictionary(`
`26`		`- m => m.Groups[2].Value.Trim().Replace("<", "<"),`
`27`		`- m => m.Groups[1].Value.Trim().Replace("<", "<").Replace("[!WARNING]", "WARNING:"));`
	`26`	`+ m => m.Groups[1].Value.Trim().Replace("<", "<"),`
	`27`	`+ m => m.Groups[0].Value.Trim().Replace("<", "<").Replace("[!WARNING]", "WARNING:").Replace("[!NOTE]", "NOTE:"));`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`