Fix Span Debugger Display String to correctly show the string contents (

dotnet/corefx#27338) Commit migrated from dotnet/corefx@ad34249
picenka21 · Feb 22, 2018 · ef1cab8 · ef1cab8
1 parent 6a2904f
commit ef1cab8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/libraries/System.Memory/src/System/ReadOnlySpan.Portable.cs b/src/libraries/System.Memory/src/System/ReadOnlySpan.Portable.cs
@@ -16,7 +16,7 @@ namespace System
     /// or native memory, or to memory allocated on the stack. It is type- and memory-safe.
     /// </summary>
     [DebuggerTypeProxy(typeof(SpanDebugView<>))]
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{ToString(),raw}")]
     public readonly ref partial struct ReadOnlySpan<T>
     {
         /// <summary>
@@ -108,9 +108,6 @@ internal ReadOnlySpan(Pinnable<T> pinnable, IntPtr byteOffset, int length)
             _byteOffset = byteOffset;
         }
 
-        //Debugger Display = System.ReadOnlySpan<T>[length]
-        private string DebuggerDisplay => string.Format("System.ReadOnlySpan<{0}>[{1}]", typeof(T).Name, Length);
-
         /// <summary>
         /// Returns the specified element of the read-only span.
         /// </summary>

diff --git a/src/libraries/System.Memory/src/System/Span.Portable.cs b/src/libraries/System.Memory/src/System/Span.Portable.cs
@@ -16,7 +16,7 @@ namespace System
     /// or native memory, or to memory allocated on the stack. It is type- and memory-safe.
     /// </summary>
     [DebuggerTypeProxy(typeof(SpanDebugView<>))]
-    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    [DebuggerDisplay("{ToString(),raw}")]
     public readonly ref partial struct Span<T>
     {
         /// <summary>
@@ -112,9 +112,6 @@ internal Span(Pinnable<T> pinnable, IntPtr byteOffset, int length)
             _byteOffset = byteOffset;
         }
 
-        //Debugger Display = System.Span<T>[length]
-        private string DebuggerDisplay => string.Format("System.Span<{0}>[{1}]", typeof(T).Name, _length);
-
         /// <summary>
         /// Returns a reference to specified element of the Span.
         /// </summary>