From 50efce1bf4334ba9c8ce03805ca93ed74859ab0d Mon Sep 17 00:00:00 2001 From: Max Katz Date: Tue, 15 Nov 2022 02:02:05 -0500 Subject: [PATCH] Fix selectors with template bindings --- .../AvaloniaXamlIlSelectorTransformer.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs index 467dced080..ba0da4fbe0 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs @@ -208,17 +208,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers if (node is XamlIlCombinatorSelector { SelectorType: XamlIlCombinatorSelector.CombinatorSelectorType.Template - } templateSelector) + }) { - if (templateSelector.Previous is XamlIlNestingSelector nestingSelector) - { - return nestingSelector.TargetType; - } - if (templateSelector.Previous is XamlIlTypeSelector typeSelector) - { - return typeSelector.TargetType; - } - return null; + return node.Previous.TargetType; } node = node.Previous; }