From ba4b7b97f8297024f17bd1fb2bb9f74bea17f2af Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Mon, 1 Nov 2021 23:17:50 +0100
Subject: [PATCH] Escape any Markup when displaying selected prompt items

If the item contained escaped markup, after the call to RemoveMarkup
the string will contain unescaped markup (that the user explicitly had
escaped before) for those cases we need to escape all remaining markup.
---
 .../Prompts/MultiSelectionPrompt.cs           |  2 +-
 .../Prompts/SelectionPrompt.cs                |  2 +-
 .../Unit/Prompts/SelectionPromptTests.cs      | 30 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 test/Spectre.Console.Tests/Unit/Prompts/SelectionPromptTests.cs

diff --git a/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs b/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs
index 69eef59..45c95b0 100644
--- a/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs
+++ b/src/Spectre.Console/Prompts/MultiSelectionPrompt.cs
@@ -253,7 +253,7 @@ namespace Spectre.Console
                 var text = (Converter ?? TypeConverterHelper.ConvertToString)?.Invoke(item.Node.Data) ?? item.Node.Data.ToString() ?? "?";
                 if (current)
                 {
-                    text = text.RemoveMarkup();
+                    text = text.RemoveMarkup().EscapeMarkup();
                 }
 
                 var checkbox = item.Node.IsSelected
diff --git a/src/Spectre.Console/Prompts/SelectionPrompt.cs b/src/Spectre.Console/Prompts/SelectionPrompt.cs
index 29a0e0f..b71fa59 100644
--- a/src/Spectre.Console/Prompts/SelectionPrompt.cs
+++ b/src/Spectre.Console/Prompts/SelectionPrompt.cs
@@ -167,7 +167,7 @@ namespace Spectre.Console
                 var text = (Converter ?? TypeConverterHelper.ConvertToString)?.Invoke(item.Node.Data) ?? item.Node.Data.ToString() ?? "?";
                 if (current)
                 {
-                    text = text.RemoveMarkup();
+                    text = text.RemoveMarkup().EscapeMarkup();
                 }
 
                 grid.AddRow(new Markup(indent + prompt + " " + text, style));
diff --git a/test/Spectre.Console.Tests/Unit/Prompts/SelectionPromptTests.cs b/test/Spectre.Console.Tests/Unit/Prompts/SelectionPromptTests.cs
new file mode 100644
index 0000000..06a607e
--- /dev/null
+++ b/test/Spectre.Console.Tests/Unit/Prompts/SelectionPromptTests.cs
@@ -0,0 +1,30 @@
+using System;
+using Shouldly;
+using Spectre.Console.Testing;
+using Xunit;
+
+namespace Spectre.Console.Tests.Unit
+{
+    public sealed class SelectionPromptTests
+    {
+        [Fact]
+        [GitHubIssue(608)]
+        public void Should_Not_Throw_When_Selecting_An_Item_With_Escaped_Markup()
+        {
+            // Given
+            var console = new TestConsole();
+            console.Profile.Capabilities.Interactive = true;
+            console.Input.PushKey(ConsoleKey.Enter);
+            var input = "[red]This text will never be red[/]".EscapeMarkup();
+
+            // When
+            var prompt = new SelectionPrompt<string>()
+                    .Title("Select one")
+                    .AddChoices(input);
+            prompt.Show(console);
+            
+            // Then
+            console.Output.ShouldContain(@"[red]This text will never be red[/]");
+        }    
+    }
+}