From f385cc12f1836185afaf9de279a0d5affb30490a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 4 Jul 2022 13:44:30 +0200
Subject: [PATCH] Remove debug/unused code.

---
 .../AvaloniaXamlIlSetterTransformer.cs        | 50 -------------------
 .../Styling/SelectorTests_Nesting.cs          |  7 ---
 2 files changed, 57 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
index 06e34a85a2..6da95be1c1 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlSetterTransformer.cs
@@ -27,7 +27,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 .FirstOrDefault(x => x.Property.GetClrProperty().Name == "Property");
             if (property != null)
             {
-
                 var propertyName = property.Values.OfType<XamlAstTextNode>().FirstOrDefault()?.Text;
                 if (propertyName == null)
                     throw new XamlParseException("Setter.Property must be a string", node);
@@ -68,55 +67,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             return node;
         }
 
-        private (IXamlLineInfo, IXamlType) GetTargetType(AstTransformationContext context, IXamlAstNode node)
-        {
-            foreach (var n in context.ParentNodes())
-            {
-                if (n is XamlAstObjectNode parent)
-                {
-                    switch (parent.Type.GetClrType().FullName)
-                    {
-                        case "Avalonia.Styling.Style":
-                            var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-                                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector");
-                            if (selectorProperty == null)
-                                throw new XamlParseException("Can not find parent Style Selector.", node);
-                            var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-                            if (selector?.TargetType != null)
-                                return (selector, selector.TargetType);
-                            throw new XamlParseException(
-                                "Can not resolve parent Style Selector type", node);
-
-                        case "Avalonia.Styling.ControlTheme":
-                            var targetTypeProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-                                .FirstOrDefault(p => p.Property.GetClrProperty().Name == "TargetType");
-                            if (targetTypeProperty == null)
-                                throw new XamlParseException("ControlTemplate has no TargetType.", parent);
-                            break;
-                    }
-                }
-            }
-
-            throw new XamlParseException("'Setter' is only valid inside a 'Style' or 'ControlTheme'.", node);
-            //var parent = context.ParentNodes().OfType<XamlAstObjectNode>()
-            //    .FirstOrDefault(p => p.Type.GetClrType().FullName == "Avalonia.Styling.Style" ||
-            //                         p.Type.GetClrType().FullName == "Avalonia.Styling.ControlTheme");
-
-            //if (parent == null)
-            //    throw new XamlParseException(
-            //        "Avalonia.Styling.Setter is only valid inside Avalonia.Styling.Style", node);
-            //var selectorProperty = parent.Children.OfType<XamlAstXamlPropertyValueNode>()
-            //    .FirstOrDefault(p => p.Property.GetClrProperty().Name == "Selector" ||
-            //                         p.Property.GetClrProperty().Name == "TargetType");
-            //if (selectorProperty == null)
-            //    throw new XamlParseException(
-            //        "Can not find parent Style Selector or ControlTemplate TargetType", node);
-            //var selector = selectorProperty.Values.FirstOrDefault() as XamlIlSelectorNode;
-            //if (selector?.TargetType == null)
-            //    throw new XamlParseException(
-            //        "Can not resolve parent Style Selector type", node);
-        }
-
         class SetterValueProperty : XamlAstClrProperty
         {
             public SetterValueProperty(IXamlLineInfo line, IXamlType setterType, IXamlType targetType,
diff --git a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
index bd7f0338e6..a60d21a018 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Nesting.cs
@@ -170,15 +170,8 @@ namespace Avalonia.Base.UnitTests.Styling
                 }
             };
 
-            // REMOOOOVEEEE
-            var foo = new Style(x => x.OfType<Button>().Template().OfType<Control1>());
-            var match2 = foo.Selector.Match(control, parent);
-            Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match2.Result);
-
             var match = nested.Selector.Match(control, parent);
             Assert.Equal(SelectorMatchResult.AlwaysThisInstance, match.Result);
-
-
         }
 
         [Fact]