From d2823110318865693625463f92eaf42c64ed98c4 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 31 May 2018 18:39:03 -0500
Subject: [PATCH] Fix bug in ExpressionVisitorNodeBuilder.

---
 .../Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs b/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
index 5affe227e1..433cfd1889 100644
--- a/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
@@ -65,7 +65,8 @@ namespace Avalonia.Data.Core.Parsers
 
         protected override Expression VisitIndex(IndexExpression node)
         {
-            var visited = base.VisitIndex(node);
+            Visit(node.Object);
+
             if (node.Indexer == AvaloniaObjectIndexer)
             {
                 var property = GetArgumentExpressionValue<AvaloniaProperty>(node.Arguments[0]);
@@ -76,7 +77,7 @@ namespace Avalonia.Data.Core.Parsers
                 Nodes.Add(new IndexerExpressionNode(node));
             }
 
-            return visited;
+            return node;
         }
 
         private T GetArgumentExpressionValue<T>(Expression expr)
@@ -158,7 +159,6 @@ namespace Avalonia.Data.Core.Parsers
 
         protected override Expression VisitMethodCall(MethodCallExpression node)
         {
-            base.VisitMethodCall(node);
             var property = TryGetPropertyFromMethod(node.Method);
 
             if (property != null)