Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 0e4c8b8

Browse files
committed
Fix escaping of char literals in debugger output.
1 parent b454359 commit 0e4c8b8

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

src/AddIns/Debugger/Debugger.AddIn/NRefactory/ExpressionEvaluationVisitor.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -490,11 +490,7 @@ public static string FormatValue(Thread evalThread, Value val)
490490
}
491491
sb.Append("}");
492492
return sb.ToString();
493-
} else if (val.Type.IsKnownType(KnownTypeCode.Char)) {
494-
return "'" + TextWriterTokenWriter.ConvertChar((char)val.PrimitiveValue) + "'";
495-
} else if (val.Type.IsKnownType(KnownTypeCode.String)) {
496-
return "\"" + TextWriterTokenWriter.ConvertString((string)val.PrimitiveValue) + "\"";
497-
} else if (val.Type.IsPrimitiveType()) {
493+
} else if (val.Type.IsKnownType(KnownTypeCode.String) || val.Type.IsPrimitiveType()) {
498494
return TextWriterTokenWriter.PrintPrimitiveValue(val.PrimitiveValue);
499495
} else {
500496
return val.InvokeToString(evalThread);

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/TextWriterOutputFormatter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ static string ConvertCharLiteral(char ch)
333333
/// Gets the escape sequence for the specified character.
334334
/// </summary>
335335
/// <remarks>This method does not convert ' or ".</remarks>
336-
public static string ConvertChar(char ch)
336+
static string ConvertChar(char ch)
337337
{
338338
switch (ch) {
339339
case '\\':

0 commit comments

Comments
 (0)