refactor regular expressions

turns out i didn't know about lazy quantifiers

Author: Ellpeck

MLEM.Ui/Parsers/UiMarkdownParser.cs

@@ -53,7 +53,7 @@ public UiMarkdownParser(bool applyDefaultStyling = true) : base(applyDefaultStyl
                 }
 
                 // images
-                var imageMatch = Regex.Match(line, @"!\[\]\(([^)]+)\)");
+                var imageMatch = Regex.Match(line, @"!\[\]\((.+?)\)");
                 if (imageMatch.Success) {
                     yield return (ElementType.Image, this.ParseImage(imageMatch.Groups[1].Value));
                     continue;
@@ -79,16 +79,16 @@ public UiMarkdownParser(bool applyDefaultStyling = true) : base(applyDefaultStyl
 
         private string ParseParagraph(string par) {
             // replace links
-            par = Regex.Replace(par, @"<([^>]+)>", "<l $1>$1</l>");
-            par = Regex.Replace(par, @"\[([^\]]+)\]\(([^)]+)\)", "<l $2>$1</l>");
+            par = Regex.Replace(par, "<(.+?)>", "<l $1>$1</l>");
+            par = Regex.Replace(par, @"\[(.+?)\]\((.+?)\)", "<l $2>$1</l>");
             // replace formatting
-            par = Regex.Replace(par, @"\*\*([^\*]+)\*\*", "<b>$1</b>");
-            par = Regex.Replace(par, @"__([^_]+)__", "<b>$1</b>");
-            par = Regex.Replace(par, @"\*([^\*]+)\*", "<i>$1</i>");
-            par = Regex.Replace(par, @"_([^_]+)_", "<i>$1</i>");
-            par = Regex.Replace(par, @"~~([^~]+)~~", "<st>$1</st>");
+            par = Regex.Replace(par, @"\*\*(.+?)\*\*", "<b>$1</b>");
+            par = Regex.Replace(par, "__(.+?)__", "<b>$1</b>");
+            par = Regex.Replace(par, @"\*(.+?)\*", "<i>$1</i>");
+            par = Regex.Replace(par, "_(.+?)_", "<i>$1</i>");
+            par = Regex.Replace(par, "~~(.+?)~~", "<st>$1</st>");
             // replace inline code with custom code font
-            par = Regex.Replace(par, @"`([^`]+)`", $"<f {this.CodeFont}>$1</f>");
+            par = Regex.Replace(par, "`(.+?)`", $"<f {this.CodeFont}>$1</f>");
             return par;
         }
 

MLEM.Ui/UiSystem.cs

@@ -232,10 +232,10 @@ public UiSystem(Game game, UiStyle style, InputHandler inputHandler = null, bool
 
             this.TextFormatter = new TextFormatter(hasFontModifierFormatting, hasColorFormatting, hasAnimationFormatting, hasMacroFormatting);
             if (hasUiFormatting) {
-                this.TextFormatter.Codes.Add(new Regex("<l(?: ([^>]+))?>"), (f, m, r) => new LinkCode(m, r, 1 / 16F, 0.85F,
+                this.TextFormatter.Codes.Add(new Regex("<l(?: (.+?))?>"), (f, m, r) => new LinkCode(m, r, 1 / 16F, 0.85F,
                     t => this.Controls.MousedElement is Paragraph.Link l1 && l1.Token == t || this.Controls.TouchedElement is Paragraph.Link l2 && l2.Token == t,
                     d => this.Style.LinkColor));
-                this.TextFormatter.Codes.Add(new Regex("<f ([^>]+)>"), (_, m, r) => new FontCode(m, r,
+                this.TextFormatter.Codes.Add(new Regex("<f (.+?)>"), (_, m, r) => new FontCode(m, r,
                     f => this.Style.AdditionalFonts != null && this.Style.AdditionalFonts.TryGetValue(m.Groups[1].Value, out var c) ? c : f));
             }
         }