tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fixes: minor fixes

pull/6992/head
Giuseppe Lippolis 5 years ago
parent
a97a5ee4b8
commit
9f2390ae3c
1 changed files with 3 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs

9
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
View File

@ -86,15 +86,13 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
result = new XamlIlPropertyEqualsSelector(result, targetProperty, typedValue); result = new XamlIlPropertyEqualsSelector(result, targetProperty, typedValue);
break; break;
} }
case SelectorGrammar.AttachedPropertySyntax: case SelectorGrammar.AttachedPropertySyntax attachedProperty:
{ {
var targetType = result?.TargetType; var targetType = result?.TargetType;
if (targetType == null) if (targetType == null)
{ {
throw new XamlParseException("Attached Property selectors must be applied to a type.",node); throw new XamlParseException("Attached Property selectors must be applied to a type.",node);
} }
var attachedProperty= (SelectorGrammar.AttachedPropertySyntax)i;
var attachedPropertyOwnerType = typeResolver(attachedProperty.Xmlns, attachedProperty.TypeName).Type; var attachedPropertyOwnerType = typeResolver(attachedProperty.Xmlns, attachedProperty.TypeName).Type;
if (attachedPropertyOwnerType is null) if (attachedPropertyOwnerType is null)
@ -108,12 +106,12 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
.FirstOrDefault(f => f.IsStatic .FirstOrDefault(f => f.IsStatic
&& f.IsPublic && f.IsPublic
&& f.Name == attachedPropertyName && f.Name == attachedPropertyName
&& f.FieldType!.GenericTypeDefinition == avaloniaAttachedPropertyT && f.FieldType.GenericTypeDefinition == avaloniaAttachedPropertyT
); );
if (targetPropertyField is null) if (targetPropertyField is null)
{ {
throw new XamlParseException($"Cannot find '{attachedProperty.Property}' on '{attachedPropertyOwnerType}", node); throw new XamlParseException($"Cannot find '{attachedProperty.Property}' on '{attachedPropertyOwnerType.GetFqn()}", node);
} }
var targetPropertyType = XamlIlAvaloniaPropertyHelper var targetPropertyType = XamlIlAvaloniaPropertyHelper
@ -127,7 +125,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
node); node);
result = new XamlIlAttacchedPropertyEqualsSelector(result, targetPropertyField, typedValue); result = new XamlIlAttacchedPropertyEqualsSelector(result, targetPropertyField, typedValue);
break; break;
} }
case SelectorGrammar.ChildSyntax child: case SelectorGrammar.ChildSyntax child:

Write Preview
Loading…
Cancel
Save