From bc39305fd0a088a306e8c13358fa8fc426fe9fc0 Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Sun, 15 Nov 2020 18:16:58 +0200
Subject: [PATCH] clean up

---
 .../AvaloniaXamlIlBindingPathParser.cs        | 23 ++++++-------------
 ...ransformSyntheticCompiledBindingMembers.cs |  8 +------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
index 7944d8b569..24cded1d22 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlBindingPathParser.cs
@@ -72,16 +72,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     v.Property is AvaloniaSyntheticCompiledBindingProperty prop
                     && prop.Name == SyntheticCompiledBindingPropertyName.ElementName);
 
-            var sourceProperty = syntheticCompiledBindingProperties
-                .FirstOrDefault(v =>
-                    v.Property is AvaloniaSyntheticCompiledBindingProperty prop
-                    && prop.Name == SyntheticCompiledBindingPropertyName.Source);
-
             var relativeSourceProperty = syntheticCompiledBindingProperties
                 .FirstOrDefault(v =>
                     v.Property is AvaloniaSyntheticCompiledBindingProperty prop
                     && prop.Name == SyntheticCompiledBindingPropertyName.RelativeSource);
 
+            var sourceProperty = binding.Children.OfType<XamlAstXamlPropertyValueNode>()
+                .FirstOrDefault(v =>
+                    v.Property is XamlAstClrProperty prop
+                    && prop.Name == "Source");
+
             if (elementNameProperty?.Values[0] is XamlAstTextNode elementName)
             {
                 convertedNode = new BindingExpressionGrammar.NameNode { Name = elementName.Text };
@@ -91,14 +91,9 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                 throw new XamlParseException($"Invalid ElementName '{elementNameProperty.Values[0]}'.", elementNameProperty.Values[0]);
             }
 
-            if (sourceProperty?.Values[0] != null)
+            if (sourceProperty != null && convertedNode != null)
             {
-                if (convertedNode != null)
-                {
-                    throw new XamlParseException("Only one of ElementName, Source, or RelativeSource specified as a binding source. Only one property is allowed.", binding);
-                }
-
-                convertedNode = new RawSourceBindingExpressionNode(sourceProperty?.Values[0]);
+                throw new XamlParseException("Only one of ElementName, Source, or RelativeSource specified as a binding source. Only one property is allowed.", binding);
             }
 
             if (GetRelativeSourceObjectFromAssignment(
@@ -223,10 +218,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
             {
                 binding.Children.Remove(elementNameProperty);
             }
-            if (sourceProperty != null)
-            {
-                binding.Children.Remove(sourceProperty);
-            }
             if (relativeSourceProperty != null)
             {
                 binding.Children.Remove(relativeSourceProperty);
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformSyntheticCompiledBindingMembers.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformSyntheticCompiledBindingMembers.cs
index 6cb6e4e2d1..ba05347a52 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformSyntheticCompiledBindingMembers.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlTransformSyntheticCompiledBindingMembers.cs
@@ -25,11 +25,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
                     return new AvaloniaSyntheticCompiledBindingProperty(node,
                         SyntheticCompiledBindingPropertyName.RelativeSource);
                 }
-                else if (prop.Name == "Source")
-                {
-                    //return new AvaloniaSyntheticCompiledBindingProperty(node,
-                    //    SyntheticCompiledBindingPropertyName.Source);
-                }
             }
 
             return node;
@@ -39,8 +34,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
     enum SyntheticCompiledBindingPropertyName
     {
         ElementName,
-        RelativeSource,
-        Source
+        RelativeSource
     }
 
     class AvaloniaSyntheticCompiledBindingProperty : XamlAstNode, IXamlAstPropertyReference