Browse Source

Also check for previous XamlIlTypeSelector

pull/9434/head
Max Katz 4 years ago
parent
commit
bdd588fef8
  1. 8
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
  2. 2
      tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs

8
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs

@ -210,14 +210,14 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
SelectorType: XamlIlCombinatorSelector.CombinatorSelectorType.Template
} templateSelector)
{
if (templateSelector.TargetType is {} targetType)
{
return targetType;
}
if (templateSelector.Previous is XamlIlNestingSelector nestingSelector)
{
return nestingSelector.TargetType;
}
if (templateSelector.Previous is XamlIlTypeSelector typeSelector)
{
return typeSelector.TargetType;
}
return null;
}
node = node.Previous;

2
tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs

@ -787,7 +787,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
Assert.Equal(textBox.InnerLeftContent, result.Content);
}
}
[Fact]
public void ResolvesElementNameInTemplate()
{

Loading…
Cancel
Save