From bc0ada009461679ef8517cc30ad1b2e5c0165576 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Mon, 31 Aug 2020 18:35:40 +0200
Subject: [PATCH] Preferring user-provided string conversion over
 TypeDescriptor

---
 src/Avalonia.Controls/ColumnDefinitions.cs    | 10 ++++-
 .../ViewModels/PropertyViewModel.cs           | 37 ++++++++++++++-----
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls/ColumnDefinitions.cs b/src/Avalonia.Controls/ColumnDefinitions.cs
index ed4f9dbe99..7e355ab357 100644
--- a/src/Avalonia.Controls/ColumnDefinitions.cs
+++ b/src/Avalonia.Controls/ColumnDefinitions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Specialized;
 using System.Linq;
+using System.Text;
 using Avalonia.Collections;
 
 namespace Avalonia.Controls
@@ -13,7 +14,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Initializes a new instance of the <see cref="ColumnDefinitions"/> class.
         /// </summary>
-        public ColumnDefinitions() : base ()
+        public ColumnDefinitions()
         {
         }
 
@@ -27,6 +28,11 @@ namespace Avalonia.Controls
             AddRange(GridLength.ParseLengths(s).Select(x => new ColumnDefinition(x)));
         }
 
+        public override string ToString()
+        {
+            return string.Join(",", this.Select(x => x.Width));
+        }
+
         /// <summary>
         /// Parses a string representation of column definitions collection.
         /// </summary>
@@ -34,4 +40,4 @@ namespace Avalonia.Controls
         /// <returns>The <see cref="ColumnDefinitions"/>.</returns>
         public static ColumnDefinitions Parse(string s) => new ColumnDefinitions(s);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
index ddbdae7ed9..2d69764ae8 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
 using System.Reflection;
@@ -8,8 +9,8 @@ namespace Avalonia.Diagnostics.ViewModels
     internal abstract class PropertyViewModel : ViewModelBase
     {
         private const BindingFlags PublicStatic = BindingFlags.Public | BindingFlags.Static;
-        private static readonly Type[] StringParameter = new[] { typeof(string) };
-        private static readonly Type[] StringIFormatProviderParameters = new[] { typeof(string), typeof(IFormatProvider) };
+        private static readonly Type[] StringParameter = { typeof(string) };
+        private static readonly Type[] StringIFormatProviderParameters = { typeof(string), typeof(IFormatProvider) };
 
         public abstract object Key { get; }
         public abstract string Name { get; }
@@ -25,19 +26,37 @@ namespace Avalonia.Diagnostics.ViewModels
                 return "(null)";
             }
 
-            var converter = TypeDescriptor.GetConverter(value);
-            return converter?.ConvertToString(value) ?? value.ToString();
+            //Check if there's an user provided ToString(), prefer that over the TypeDescriptor conversion
+            if (value.GetType().GetMethod(nameof(ToString), System.Type.EmptyTypes)
+                .DeclaringType != typeof(object))
+            {
+                return value.ToString();
+            }
+
+            try
+            {
+                var converter = TypeDescriptor.GetConverter(value);
+
+                return converter.ConvertToString(value);
+            }
+            catch
+            {
+                return value.ToString();
+            }
         }
 
         protected static object ConvertFromString(string s, Type targetType)
         {
-            var converter = TypeDescriptor.GetConverter(targetType);
-            
-            if (converter != null && converter.CanConvertFrom(typeof(string)))
+            try
             {
-                return converter.ConvertFrom(null, CultureInfo.InvariantCulture, s);
+                var converter = TypeDescriptor.GetConverter(targetType);
+
+                if (converter.CanConvertFrom(typeof(string)))
+                {
+                    return converter.ConvertFrom(null, CultureInfo.InvariantCulture, s);
+                }
             }
-            else
+            catch
             {
                 var method = targetType.GetMethod("Parse", PublicStatic, null, StringIFormatProviderParameters, null);