From 496b978cdbb830a0eb44d2b11915ff3c615c492a Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 30 May 2022 18:36:14 -0400
Subject: [PATCH] Run xDataType after TypeReferenceResolver

---
 .../CompilerExtensions/AvaloniaXamlIlCompiler.cs       | 10 ++++++----
 .../Transformers/XDataTypeTransformer.cs               |  8 +-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
index 7514b0e12e..04a61e5f10 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs
@@ -31,10 +31,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             // Before everything else
             
             Transformers.Insert(0, new XNameTransformer());
-            Transformers.Insert(1, new XDataTypeTransformer());
-            Transformers.Insert(2, new IgnoredDirectivesTransformer());
-            Transformers.Insert(3, _designTransformer = new AvaloniaXamlIlDesignPropertiesTransformer());
-            Transformers.Insert(4, _bindingTransformer = new AvaloniaBindingExtensionTransformer());
+            Transformers.Insert(1, new IgnoredDirectivesTransformer());
+            Transformers.Insert(2, _designTransformer = new AvaloniaXamlIlDesignPropertiesTransformer());
+            Transformers.Insert(3, _bindingTransformer = new AvaloniaBindingExtensionTransformer());
             
             // Targeted
             InsertBefore<PropertyReferenceResolver>(
@@ -57,6 +56,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
                 new AvaloniaXamlIlResolveByNameMarkupExtensionReplacer()
             );
 
+            InsertAfter<TypeReferenceResolver>(
+                new XDataTypeTransformer());
+
             // After everything else
             InsertBefore<NewObjectTransformer>(
                 new AddNameScopeRegistration(),
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs
index 7b90164974..845dc5f831 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/XDataTypeTransformer.cs
@@ -34,13 +34,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                         
                         var templateDataTypeAttribute = context.GetAvaloniaTypes().DataTypeAttribute;
 
-                        var clrType = on.Type switch
-                        {
-                            XamlAstClrTypeReference clrRef => clrRef.Type,
-                            XamlAstXmlTypeReference xmlRef => TypeReferenceResolver.ResolveType(context, xmlRef.Name,
-                                on.Type.IsMarkupExtension, on, strict: false).Type,
-                            _ => null
-                        };
+                        var clrType = (on.Type as XamlAstClrTypeReference)?.Type;
                         if (clrType is null)
                         {
                             break;