Fix exception formatting for generic methods (#639)

The generic parameters were double escaped and would display as `[[T0,T1,TRet]]` instead of `[T0,T1,TRet]`. This is because the `builder.AppendWithStyle` method already escapes its value so the caller must not escape the passed value.
spectreconsole · Nov 26, 2021 · 168f352 · 168f352
1 parent 225305f
commit 168f352
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Spectre.Console/Widgets/Exceptions/ExceptionFormatter.cs b/src/Spectre.Console/Widgets/Exceptions/ExceptionFormatter.cs
@@ -149,12 +149,12 @@ private static string Emphasize(string input, char[] separators, Style color, bo
                 {
                     builder.AppendWithStyle(
                         settings.Style.NonEmphasized,
-                        type.Substring(0, index + 1).EscapeMarkup());
+                        type.Substring(0, index + 1));
                 }
 
                 builder.AppendWithStyle(
                     color,
-                    type.Substring(index + 1, type.Length - index - 1).EscapeMarkup());
+                    type.Substring(index + 1, type.Length - index - 1));
             }
             else
             {

diff --git a/test/Spectre.Console.Tests/Expectations/Exception/CallSite.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Exception/CallSite.Output.verified.txt
@@ -1,6 +1,6 @@
 System.InvalidOperationException: Something threw!
      System.InvalidOperationException: Throwing!
-       at Spectre.Console.Tests.Data.TestExceptions.GenericMethodThatThrows[[T0,T1,TRet]](Nullable`1 number) in /xyz/Exceptions.cs:nn
+       at Spectre.Console.Tests.Data.TestExceptions.GenericMethodThatThrows[T0,T1,TRet](Nullable`1 number) in /xyz/Exceptions.cs:nn
        at Spectre.Console.Tests.Data.TestExceptions.ThrowWithGenericInnerException() in /xyz/Exceptions.cs:nn
   at Spectre.Console.Tests.Data.TestExceptions.ThrowWithGenericInnerException() in /xyz/Exceptions.cs:nn
   at Spectre.Console.Tests.Unit.ExceptionTests.<>c.<Should_Write_Exceptions_With_Generic_Type_Parameters_In_Callsite_As_Expected>b__4_0() in /xyz/ExceptionTests.cs:nn