Browse Source

Fix merge

pull/8572/head
Luis von der Eltz 4 years ago
parent
commit
6820d019d9
  1. 13
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs

13
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs

@ -27,18 +27,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
if (styleParent != null)
{
var selectorProperty = styleParent.Children.OfType<XamlAstXamlPropertyValueNode>()
.FirstOrDefault(x => x.Property.GetClrProperty().Name == "Selector");
if (selectorProperty == null)
throw new XamlParseException(
"Can not find parent Style Selector", node);
var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
targetType = selector?.TargetType
targetType = styleParent.TargetType.GetClrType()
?? throw new XamlParseException("Can not resolve parent Style Selector type", node);
lineInfo = selector;
lineInfo = on;
}
else
{

Loading…
Cancel
Save