Improved formatting of type names shown in Locals window

dnSpyEx · Jun 24, 2023 · 55e9aa2 · 55e9aa2
1 parent 0f9d37b
commit 55e9aa2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/dnSpy/Roslyn/dnSpy.Roslyn/Debugger/ValueNodes/DbgDotNetValueNodeImpl.cs b/dnSpy/Roslyn/dnSpy.Roslyn/Debugger/ValueNodes/DbgDotNetValueNodeImpl.cs
@@ -101,11 +101,11 @@ sealed class DbgDotNetValueNodeImpl : DbgDotNetValueNode {
 		}
 
 		public override bool FormatActualType(DbgEvaluationInfo evalInfo, IDbgTextWriter output, DbgDotNetFormatter formatter, DbgValueFormatterTypeOptions options, DbgValueFormatterOptions valueOptions, CultureInfo? cultureInfo) =>
-			columnFormatter?.FormatActualType(evalInfo, output, formatter, options, valueOptions, cultureInfo) ??
+			columnFormatter?.FormatActualType(evalInfo, output, formatter, options, valueOptions, cultureInfo) == true ||
 			FormatDebuggerDisplayAttributeType(evalInfo, output, formatter, valueOptions, cultureInfo);
 
 		public override bool FormatExpectedType(DbgEvaluationInfo evalInfo, IDbgTextWriter output, DbgDotNetFormatter formatter, DbgValueFormatterTypeOptions options, DbgValueFormatterOptions valueOptions, CultureInfo? cultureInfo) =>
-			columnFormatter?.FormatExpectedType(evalInfo, output, formatter, options, valueOptions, cultureInfo) ??
+			columnFormatter?.FormatExpectedType(evalInfo, output, formatter, options, valueOptions, cultureInfo) == true ||
 			FormatDebuggerDisplayAttributeType(evalInfo, output, formatter, valueOptions, cultureInfo);
 
 		bool FormatDebuggerDisplayAttributeType(DbgEvaluationInfo evalInfo, IDbgTextWriter output, DbgDotNetFormatter formatter, DbgValueFormatterOptions options, CultureInfo? cultureInfo) {

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn/Debugger/ValueNodes/LanguageValueNodeFactory.cs b/dnSpy/Roslyn/dnSpy.Roslyn/Debugger/ValueNodes/LanguageValueNodeFactory.cs
@@ -135,7 +135,8 @@ abstract class LanguageValueNodeFactory : DbgDotNetValueNodeFactory {
 			const bool causesSideEffects = false;
 			var property = PropertyState.TryGetProperty(method);
 			var imageName = property is not null ? ImageNameUtils.GetImageName(property) : ImageNameUtils.GetImageName(method, SupportsModuleTypes);
-			return CreateValue(evalInfo, default, value, formatSpecifiers, options, expression, imageName, isReadOnly, causesSideEffects, value.Type, false, columnFormatter);
+			var expectedType = method is DmdMethodInfo mi ? mi.ReturnType : value.Type;
+			return CreateValue(evalInfo, default, value, formatSpecifiers, options, expression, imageName, isReadOnly, causesSideEffects, expectedType, false, columnFormatter);
 		}
 
 		internal void FormatReturnValueMethodName(DbgEvaluationInfo evalInfo, IDbgTextWriter output, DbgValueFormatterOptions options, CultureInfo? cultureInfo, DmdMethodBase method) =>

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn/Debugger/ValueNodes/ReturnValueColumnFormatter.cs b/dnSpy/Roslyn/dnSpy.Roslyn/Debugger/ValueNodes/ReturnValueColumnFormatter.cs
@@ -17,6 +17,7 @@
     along with dnSpy.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+using System;
 using System.Diagnostics;
 using System.Globalization;
 using dnSpy.Contracts.Debugger.DotNet.Evaluation.Formatters;
@@ -38,11 +39,11 @@ sealed class ReturnValueColumnFormatter : ColumnFormatter {
 		public override bool FormatName(DbgEvaluationInfo evalInfo, IDbgTextWriter output, DbgDotNetFormatter formatter, DbgValueFormatterOptions options, CultureInfo? cultureInfo) {
 			var formatString = dnSpy_Roslyn_Resources.LocalsWindow_MethodOrProperty_Returned;
 			const string pattern = "{0}";
-			int index = formatString.IndexOf(pattern);
+			int index = formatString.IndexOf(pattern, StringComparison.Ordinal);
 			Debug.Assert(index >= 0);
 			if (index < 0) {
 				formatString = "{0} returned";
-				index = formatString.IndexOf(pattern);
+				index = formatString.IndexOf(pattern, StringComparison.Ordinal);
 			}
 
 			if (index != 0)