fix: Address review

Author: workgroupengineering

src/Avalonia.Base/Controls/INotSharedDeferredContent.cs

@@ -3,6 +3,6 @@
 /// <summary>
 /// Represents a not shared deferred content.
 /// </summary>
-public interface INotSharedDeferredContent: IDeferredContent
+internal interface INotSharedDeferredContent: IDeferredContent
 {
 }

src/Avalonia.Base/Controls/ResourceDictionary.cs

@@ -147,8 +147,8 @@ public void AddDeferred(object key, Func<IServiceProvider?, object?> factory)
         public void AddDeferred(object key, IDeferredContent deferredContent)
             => Add(key, deferredContent);
 
-        public void AddNotShared(object key, INotSharedDeferredContent notSharedDeferredContent)
-            => Add(key, notSharedDeferredContent);
+        public void AddNotSharedDeferred(object key, IDeferredContent deferredContent)
+            => Add(key, new NotSharedDeferredItem(deferredContent));
 
         public void Clear()
         {
@@ -383,10 +383,10 @@ private sealed class DeferredItem : IDeferredContent
             public object? Build(IServiceProvider? serviceProvider) => _factory(serviceProvider);
         }
 
-        private sealed class NotSharedDeferredItem(Func<IServiceProvider?, object?> factory) : INotSharedDeferredContent
+        private sealed class NotSharedDeferredItem(IDeferredContent deferredContent) : INotSharedDeferredContent
         {
-            private readonly Func<IServiceProvider?, object?> _factory = factory;
-            public object? Build(IServiceProvider? serviceProvider) => _factory(serviceProvider);
+            private readonly IDeferredContent _deferredContent = deferredContent ;
+            public object? Build(IServiceProvider? serviceProvider) => _deferredContent.Build(serviceProvider);
         }
     }
 }

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/XamlNotSharedDeferredContentNode.cs

@@ -88,8 +88,6 @@ void InsertBeforeMany(Type[] types, params IXamlAstTransformer[] t)
 
             InsertBefore<AvaloniaXamlIlTransformInstanceAttachedProperties>(new AvaloniaXamlIlTransformRoutedEvent());
 
-            InsertAfter<AvaloniaXamlIlDeferredResourceTransformer>(new XSharedTransformer());
-
             Transformers.Add(new AvaloniaXamlIlControlTemplatePriorityTransformer());
             Transformers.Add(new AvaloniaXamlIlMetadataRemover());
             Transformers.Add(new AvaloniaXamlIlEnsureResourceDictionaryCapacityTransformer());

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Visitors;
+using XamlX;
 using XamlX.Ast;
 using XamlX.Emit;
 using XamlX.IL;
@@ -22,23 +23,61 @@ public IXamlAstNode Transform(AstTransformationContext context, IXamlAstNode nod
             if (pa.Property.DeclaringType == types.ResourceDictionary && pa.Property.Name == "Content"
                 && ShouldBeDeferred(pa.Values[1]))
             {
+                IXamlMethod addMethod = TryGetSharedValue(pa.Values[1], out var isShared) && !isShared
+                    ? types.ResourceDictionaryNotSharedDeferedAdd
+                    : types.ResourceDictionaryDeferredAdd;
+
                 pa.Values[1] = new XamlDeferredContentNode(pa.Values[1], types.XamlIlTypes.Object, context.Configuration);
                 pa.PossibleSetters = new List<IXamlPropertySetter>
                 {
-                    new XamlDirectCallPropertySetter(types.ResourceDictionaryDeferredAdd),
+                    new XamlDirectCallPropertySetter(addMethod),
                 };
             }
             else if (pa.Property.Name == "Resources" && pa.Property.Getter?.ReturnType.Equals(types.IResourceDictionary) == true
                 && ShouldBeDeferred(pa.Values[1]))
             {
+                IXamlMethod addMethod = TryGetSharedValue(pa.Values[1], out var isShared) && !isShared
+                    ? types.ResourceDictionaryNotSharedDeferedAdd
+                    : types.ResourceDictionaryDeferredAdd;
+
                 pa.Values[1] = new XamlDeferredContentNode(pa.Values[1], types.XamlIlTypes.Object, context.Configuration);
                 pa.PossibleSetters = new List<IXamlPropertySetter>
                 {
-                    new AdderSetter(pa.Property.Getter, types.ResourceDictionaryDeferredAdd),
+                    new AdderSetter(pa.Property.Getter, addMethod),
                 };
             }
 
             return node;
+
+            bool TryGetSharedValue(IXamlAstValueNode valueNode, out bool value)
+            {
+                value = default;
+                if (valueNode is XamlAstConstructableObjectNode co)
+                {
+                    // Try find x:Share directive
+                    if (co.Children.Find(d => d is XamlAstXmlDirective { Namespace: XamlNamespaces.Xaml2006, Name: "Shared" }) is XamlAstXmlDirective sharedDirective)
+                    {
+                        if (sharedDirective.Values.Count == 1 && sharedDirective.Values[0] is XamlAstTextNode text)
+                        {
+                            if (bool.TryParse(text.Text, out var parseValue))
+                            {
+                                // If the parser succeeds, remove the x:Share directive
+                                co.Children.Remove(sharedDirective);
+                                return true;
+                            }
+                            else
+                            {
+                                context.ReportTransformError("Invalid argument type for x:Shared directive.", node);
+                            }
+                        }
+                        else
+                        {
+                            context.ReportTransformError("Invalid number of arguments for x:Shared directive.", node);
+                        }
+                    }
+                }
+                return false;
+            }
         }
 
         private static bool ShouldBeDeferred(IXamlAstValueNode node)
@@ -58,14 +97,6 @@ private static bool ShouldBeDeferred(IXamlAstValueNode node)
                 return false;
             }
 
-            var sharedVisitor = new NotSharedVisitor();
-            _ = sharedVisitor.Visit(node);
-            // Ingnore if Element is marked with x:Shared="false"
-            if (sharedVisitor.Count > 0)
-            {
-                return false;
-            }
-
             // Do not defer resources, if it has any x:Name registration, as it cannot be delayed.
             // This visitor will count x:Name registrations, ignoring nested NestedScopeMetadataNode scopes.
             // We set target scope level to 0, assuming that this resource node is a scope of itself.
@@ -79,7 +110,7 @@ private static bool ShouldBeDeferred(IXamlAstValueNode node)
 
             return true;
         }
-        
+
         class AdderSetter : IXamlILOptimizedEmitablePropertySetter, IEquatable<AdderSetter>
         {
             private readonly IXamlMethod _getter;

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlDeferredResourceTransformer.cs

@@ -118,7 +118,7 @@ sealed class AvaloniaXamlIlWellKnownTypes
         public IXamlType IResourceDictionary { get; }
         public IXamlType ResourceDictionary { get; }
         public IXamlMethod ResourceDictionaryDeferredAdd { get; }
-        public IXamlMethod ResourceDictionaryNotSharedAdd { get; }
+        public IXamlMethod ResourceDictionaryNotSharedDeferedAdd { get; }
         public IXamlMethod ResourceDictionaryEnsureCapacity { get; }
         public IXamlMethod ResourceDictionaryGetCount { get; }
         public IXamlType IThemeVariantProvider { get; }
@@ -130,7 +130,6 @@ sealed class AvaloniaXamlIlWellKnownTypes
         public IXamlType IReadOnlyListOfT { get; }
         public IXamlType ControlTemplate { get; }
         public IXamlType EventHandlerT {  get; }
-        public IXamlMethod? NotSharedDeferredContentExecutorCustomization { get; set; }
 
         sealed internal class InteractivityWellKnownTypes
         {
@@ -314,7 +313,7 @@ public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
             ResourceDictionary = cfg.TypeSystem.GetType("Avalonia.Controls.ResourceDictionary");
             ResourceDictionaryDeferredAdd = ResourceDictionary.GetMethod("AddDeferred", XamlIlTypes.Void, true, XamlIlTypes.Object,
                 cfg.TypeSystem.GetType("Avalonia.Controls.IDeferredContent"));
-            ResourceDictionaryNotSharedAdd = ResourceDictionary.GetMethod("AddNotShared", XamlIlTypes.Void, true, XamlIlTypes.Object,
+            ResourceDictionaryNotSharedDeferedAdd = ResourceDictionary.GetMethod("AddNotSharedDeferred", XamlIlTypes.Void, true, XamlIlTypes.Object,
                 cfg.TypeSystem.GetType("Avalonia.Controls.INotSharedDeferredContent"));
 
             ResourceDictionaryEnsureCapacity = ResourceDictionary.GetMethod("EnsureCapacity", XamlIlTypes.Void, true, XamlIlTypes.Int32);
@@ -328,9 +327,6 @@ public AvaloniaXamlIlWellKnownTypes(TransformerConfiguration cfg)
             IReadOnlyListOfT = cfg.TypeSystem.GetType("System.Collections.Generic.IReadOnlyList`1");
             EventHandlerT = cfg.TypeSystem.GetType("System.EventHandler`1");
             Interactivity = new InteractivityWellKnownTypes(cfg);
-            var runtimeHelpers = cfg.TypeSystem.GetType("Avalonia.Markup.Xaml.XamlIl.Runtime.XamlIlRuntimeHelpers");
-            NotSharedDeferredContentExecutorCustomization =
-                runtimeHelpers.FindMethod(m => m.Name == "NotSharedDeferredTransformationFactoryV0");
         }
     }