Browse Source

feat(Markup): Address rule CA1822

pull/9189/head
Giuseppe Lippolis 4 years ago
parent
commit
4800f7a01b
  1. 6
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
  2. 8
      src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
  3. 4
      src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
  4. 6
      src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
  5. 2
      src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs
  6. 6
      src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs

6
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);

8
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)
{

4
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)

6
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))
{

2
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)
{

6
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)
{

Loading…
Cancel
Save