Browse Source

Fix escaping of char literals in debugger output.

pull/463/head
Daniel Grunwald 11 years ago
parent
commit
0e4c8b8177
  1. 6
      src/AddIns/Debugger/Debugger.AddIn/NRefactory/ExpressionEvaluationVisitor.cs
  2. 2
      src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/TextWriterOutputFormatter.cs

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

@ -490,11 +490,7 @@ namespace Debugger.AddIn @@ -490,11 +490,7 @@ namespace Debugger.AddIn
}
sb.Append("}");
return sb.ToString();
} else if (val.Type.IsKnownType(KnownTypeCode.Char)) {
return "'" + TextWriterTokenWriter.ConvertChar((char)val.PrimitiveValue) + "'";
} else if (val.Type.IsKnownType(KnownTypeCode.String)) {
return "\"" + TextWriterTokenWriter.ConvertString((string)val.PrimitiveValue) + "\"";
} else if (val.Type.IsPrimitiveType()) {
} else if (val.Type.IsKnownType(KnownTypeCode.String) || val.Type.IsPrimitiveType()) {
return TextWriterTokenWriter.PrintPrimitiveValue(val.PrimitiveValue);
} else {
return val.InvokeToString(evalThread);

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

@ -333,7 +333,7 @@ namespace ICSharpCode.NRefactory.CSharp @@ -333,7 +333,7 @@ namespace ICSharpCode.NRefactory.CSharp
/// Gets the escape sequence for the specified character.
/// </summary>
/// <remarks>This method does not convert ' or ".</remarks>
public static string ConvertChar(char ch)
static string ConvertChar(char ch)
{
switch (ch) {
case '\\':

Loading…
Cancel
Save