From 4800f7a01b666d962e2f5103ff39dce0e98fea18 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 14 Oct 2022 17:14:27 +0200
Subject: [PATCH] feat(Markup): Address rule CA1822

---
 .../CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs    | 6 ++----
 .../Converters/AvaloniaPropertyTypeConverter.cs           | 8 ++++----
 .../Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs  | 4 ++--
 .../MarkupExtensions/DynamicResourceExtension.cs          | 6 +++---
 src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs | 2 +-
 .../Markup/Parsers/Nodes/StringIndexerNode.cs             | 6 +++---
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index 6c9d510ba0..12406df765 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -67,10 +67,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             string propertyName, IXamlAstTypeReference selectorTypeReference, IXamlLineInfo lineInfo)
         {
             XamlAstNamePropertyReference forgedReference;
-            
-            var parser = new PropertyParser();
-            
-            var parsedPropertyName = parser.Parse(new CharacterReader(propertyName.AsSpan()));
+
+            var parsedPropertyName = PropertyParser.Parse(new CharacterReader(propertyName.AsSpan()));
             if(parsedPropertyName.owner == null)
                 forgedReference = new XamlAstNamePropertyReference(lineInfo, selectorTypeReference,
                     propertyName, selectorTypeReference);
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
index 45ca1c4adc..dff315c727 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
@@ -22,8 +22,8 @@ namespace Avalonia.Markup.Xaml.Converters
         {
             var registry = AvaloniaPropertyRegistry.Instance;
             var parser = new PropertyParser();
-            var (ns, owner, propertyName) = parser.Parse(new CharacterReader(((string)value).AsSpan()));
-            var ownerType = TryResolveOwnerByName(context, ns, owner);
+            var (ns, owner, propertyName) = PropertyParser.Parse(new CharacterReader(((string)value).AsSpan()));
+            var ownerType = AvaloniaPropertyTypeConverter.TryResolveOwnerByName(context, ns, owner);
             var targetType = context.GetFirstParent<ControlTemplate>()?.TargetType ??
                 context.GetFirstParent<Style>()?.Selector?.TargetType ??
                 typeof(Control);
@@ -37,7 +37,7 @@ namespace Avalonia.Markup.Xaml.Converters
 
             if (effectiveOwner != targetType &&
                 !property.IsAttached &&
-                !registry.IsRegistered(targetType, property))
+                !AvaloniaPropertyRegistry.Instance.IsRegistered(targetType, property))
             {
                 Logger.TryGet(LogEventLevel.Warning, LogArea.Property)?.Log(
                     this,
@@ -50,7 +50,7 @@ namespace Avalonia.Markup.Xaml.Converters
             return property;
         }
 
-        private Type TryResolveOwnerByName(ITypeDescriptorContext context, string ns, string owner)
+        private static Type TryResolveOwnerByName(ITypeDescriptorContext context, string ns, string owner)
         {
             if (owner != null)
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
index 9e15fb888e..078efcab6e 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Markup.Xaml.Converters
             var path = value as string;
             if (path != null)
             {
-                return CreateIconFromPath(context, path);
+                return IconTypeConverter.CreateIconFromPath(context, path);
             }
 
             var bitmap = value as IBitmap;
@@ -32,7 +32,7 @@ namespace Avalonia.Markup.Xaml.Converters
             throw new NotSupportedException();
         }
 
-        private WindowIcon CreateIconFromPath(ITypeDescriptorContext context, string s)
+        private static WindowIcon CreateIconFromPath(ITypeDescriptorContext context, string s)
         {
             var uri = s.StartsWith("/")
                 ? new Uri(s, UriKind.Relative)
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index f13ecab4e1..01d98ac9fb 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -56,19 +56,19 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
 
             if (control != null)
             {
-                var source = control.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
+                var source = control.GetResourceObservable(ResourceKey, DynamicResourceExtension.GetConverter(targetProperty));
                 return InstancedBinding.OneWay(source, _priority);
             }
             else if (_anchor is IResourceProvider resourceProvider)
             {
-                var source = resourceProvider.GetResourceObservable(ResourceKey, GetConverter(targetProperty));
+                var source = resourceProvider.GetResourceObservable(ResourceKey, DynamicResourceExtension.GetConverter(targetProperty));
                 return InstancedBinding.OneWay(source, _priority);
             }
 
             return null;
         }
 
-        private Func<object?, object?>? GetConverter(AvaloniaProperty? targetProperty)
+        private static Func<object?, object?>? GetConverter(AvaloniaProperty? targetProperty)
         {
             if (targetProperty?.PropertyType == typeof(IBrush))
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs b/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs
index ea94012096..de463e2903 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Markup.Xaml.Parsers
 {
     internal class PropertyParser
     {
-        public (string ns, string owner, string name) Parse(CharacterReader r)
+        public static (string ns, string owner, string name) Parse(CharacterReader r)
         {
             if (r.End)
             {
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
index 9c505486b7..824911902b 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
@@ -115,7 +115,7 @@ namespace Avalonia.Markup.Parsers.Nodes
 
         private bool SetValueInArray(Array array, int[] indices, object? value)
         {
-            if (ValidBounds(indices, array))
+            if (StringIndexerNode.ValidBounds(indices, array))
             {
                 array.SetValue(value, indices);
                 return true;
@@ -225,7 +225,7 @@ namespace Avalonia.Markup.Parsers.Nodes
 
         private object? GetValueFromArray(Array array, int[] indices)
         {
-            if (ValidBounds(indices, array))
+            if (StringIndexerNode.ValidBounds(indices, array))
             {
                 return array.GetValue(indices);
             }
@@ -275,7 +275,7 @@ namespace Avalonia.Markup.Parsers.Nodes
             return null;
         }
 
-        private bool ValidBounds(int[] indices, Array array)
+        private static bool ValidBounds(int[] indices, Array array)
         {
             if (indices.Length == array.Rank)
             {