Fix foreach runes bug with unicode surrogate pairs (#3894)

gui-cs · Jan 12, 2025 · 81ad695 · 81ad695
1 parent 7676f89
commit 81ad695
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Terminal.Gui/Text/TextFormatter.cs b/Terminal.Gui/Text/TextFormatter.cs
@@ -2124,7 +2124,7 @@ public static string RemoveHotKeySpecifier (string text, int hotPos, Rune hotKey
         var start = string.Empty;
         var i = 0;
 
-        foreach (Rune c in text)
+        foreach (Rune c in text.EnumerateRunes ())
         {
             if (c == hotKeySpecifier && i == hotPos)
             {

diff --git a/UnitTests/Views/LabelTests.cs b/UnitTests/Views/LabelTests.cs
@@ -1460,4 +1460,16 @@ public void CanFocus_True_MouseClick_Focuses ()
         Application.Top.Dispose ();
         Application.ResetState ();
     }
+
+    // https://github.com/gui-cs/Terminal.Gui/issues/3893
+    [Fact]
+    [SetupFakeDriver]
+    public void TestLabelUnderscoreMinus ()
+    {
+        var lbl = new Label ()
+        {
+            Text = "TextView with some more test_- text. Unicode shouldn't 𝔹Aℝ𝔽!"
+        };
+        lbl.Draw ();
+    }
 }