From bdd588fef80a2c2924127724e6018b081e1605c4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 14 Nov 2022 02:28:26 -0500
Subject: [PATCH] Also check for previous XamlIlTypeSelector

---
 .../Transformers/AvaloniaXamlIlSelectorTransformer.cs     | 8 ++++----
 .../MarkupExtensions/CompiledBindingExtensionTests.cs     | 2 +-
 2 files changed, 5 insertions(+), 5 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 2163e7c0ae..467dced080 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs
+++ b/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;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
index 2f8ad8c624..a09abdecce 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
+++ b/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()
         {