Started refactor of ExpressionObserver.

Tying to be more "rx", but also will allow us to move forward on BindingNotification changes.

src/Avalonia.Base/Avalonia.Base.csproj

@@ -117,6 +117,7 @@
     <Compile Include="Utilities\IWeakSubscriber.cs" />
     <Compile Include="Utilities\MathUtilities.cs" />
     <Compile Include="Utilities\TypeUtilities.cs" />
+    <Compile Include="Utilities\WeakObservable.cs" />
     <Compile Include="Utilities\WeakSubscriptionManager.cs" />
     <Compile Include="Utilities\WeakTimer.cs" />
   </ItemGroup>

src/Avalonia.Base/Utilities/WeakObservable.cs

@@ -0,0 +1,54 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Reactive;
+using System.Reactive.Linq;
+
+namespace Avalonia.Utilities
+{
+    /// <summary>
+    /// Provides extension methods for working with weak event handlers.
+    /// </summary>
+    public static class WeakObservable
+    {
+        /// <summary>
+        /// Converts a .NET event conforming to the standard .NET event pattern into an observable
+        /// sequence, subscribing weakly.
+        /// </summary>
+        /// <typeparam name="TEventArgs">The type of the event args.</typeparam>
+        /// <param name="target">Object instance that exposes the event to convert.</param>
+        /// <param name="eventName">Name of the event to convert.</param>
+        /// <returns></returns>
+        public static IObservable<EventPattern<object, TEventArgs>> FromEventPattern<TEventArgs>(
+            object target, 
+            string eventName)
+            where TEventArgs : EventArgs
+        {
+            Contract.Requires<ArgumentNullException>(target != null);
+            Contract.Requires<ArgumentNullException>(eventName != null);
+
+            return Observable.Create<EventPattern<object, TEventArgs>>(observer =>
+            {
+                var handler = new Handler<TEventArgs>(observer);
+                WeakSubscriptionManager.Subscribe(target, eventName, handler);
+                return () => WeakSubscriptionManager.Unsubscribe(target, eventName, handler);
+            }).Publish().RefCount();
+        }
+
+        private class Handler<TEventArgs> : IWeakSubscriber<TEventArgs> where TEventArgs : EventArgs
+        {
+            private IObserver<EventPattern<object, TEventArgs>> _observer;
+
+            public Handler(IObserver<EventPattern<object, TEventArgs>> observer)
+            {
+                _observer = observer;
+            }
+
+            public void OnEvent(object sender, TEventArgs e)
+            {
+                _observer.OnNext(new EventPattern<object, TEventArgs>(sender, e));
+            }
+        }
+    }
+}

src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs

@@ -30,39 +30,40 @@ namespace Avalonia.Markup.Xaml.Templates
 
         public object Select(object o)
         {
-            if (string.IsNullOrEmpty(MemberName))
+            throw new NotImplementedException();
-            {
+            ////if (string.IsNullOrEmpty(MemberName))
-                return o;
+            ////{
-            }
+            ////    return o;
+            ////}
 
-            if (_expressionNode == null)
+            ////if (_expressionNode == null)
-            {
+            ////{
-                _expressionNode = ExpressionNodeBuilder.Build(MemberName);
+            ////    _expressionNode = ExpressionNodeBuilder.Build(MemberName);
 
-                _memberValueNode = _expressionNode;
+            ////    _memberValueNode = _expressionNode;
 
-                while (_memberValueNode.Next != null)
+            ////    while (_memberValueNode.Next != null)
-                {
+            ////    {
-                    _memberValueNode = _memberValueNode.Next;
+            ////        _memberValueNode = _memberValueNode.Next;
-                }
+            ////    }
-            }
+            ////}
 
-            _expressionNode.Target = new WeakReference(o);
+            ////_expressionNode.Target = new WeakReference(o);
 
-            object result = _memberValueNode.CurrentValue.Target;
+            ////object result = _memberValueNode.CurrentValue.Target;
 
-            _expressionNode.Target = null;
+            ////_expressionNode.Target = null;
 
-            if (result == AvaloniaProperty.UnsetValue)
+            ////if (result == AvaloniaProperty.UnsetValue)
-            {
+            ////{
-                return null;
+            ////    return null;
-            }
+            ////}
-            else if (result is BindingNotification)
+            ////else if (result is BindingNotification)
-            {
+            ////{
-                return null;
+            ////    return null;
-            }
+            ////}
 
-            return result;
+            ////return result;
         }
     }
 }

src/Markup/Avalonia.Markup/Avalonia.Markup.csproj

@@ -42,6 +42,7 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Data\CommonPropertyNames.cs" />
+    <Compile Include="Data\EmptyExpressionNode.cs" />
     <Compile Include="Data\ExpressionNodeBuilder.cs" />
     <Compile Include="Data\ExpressionParseException.cs" />
     <Compile Include="Data\ExpressionSubject.cs" />

src/Markup/Avalonia.Markup/Data/EmptyExpressionNode.cs

@@ -0,0 +1,16 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Reactive.Linq;
+
+namespace Avalonia.Markup.Data
+{
+    internal class EmptyExpressionNode : ExpressionNode
+    {
+        protected override IObservable<object> StartListening(WeakReference reference)
+        {
+            return Observable.Return(reference.Target);
+        }
+    }
+}

src/Markup/Avalonia.Markup/Data/ExpressionNode.cs

@@ -2,111 +2,154 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Avalonia.Data;
 
 namespace Avalonia.Markup.Data
 {
-    internal abstract class ExpressionNode : IObservable<object>
+    internal abstract class ExpressionNode : ISubject<object>
     {
         protected static readonly WeakReference UnsetReference = 
             new WeakReference(AvaloniaProperty.UnsetValue);
 
-        private WeakReference _target;
+        private WeakReference _target = UnsetReference;
-
+        private IDisposable _valueSubscription;
-        private Subject<object> _subject;
+        private IObserver<object> _observer;
-
-        private WeakReference _value = UnsetReference;
 
         public ExpressionNode Next { get; set; }
 
         public WeakReference Target
         {
-            get
+            get { return _target; }
-            {
-                return _target;
-            }
             set
             {
-                var newInstance = value?.Target;
+                Contract.Requires<ArgumentNullException>(value != null);
-                var oldInstance = _target?.Target;
 
-                if (!object.Equals(oldInstance, newInstance))
+                var oldTarget = _target?.Target;
-                {
+                var newTarget = value.Target;
-                    if (oldInstance != null)
+                var running = _valueSubscription != null;
-                    {
-                        Unsubscribe(oldInstance);
-                    }
 
+                if (!ReferenceEquals(oldTarget, newTarget))
+                {
+                    _valueSubscription?.Dispose();
+                    _valueSubscription = null;
                     _target = value;
 
-                    if (newInstance != null)
+                    if (running)
-                    {
-                        SubscribeAndUpdate(_target);
-                    }
-                    else
-                    {
-                        CurrentValue = UnsetReference;
-                    }
-
-                    if (Next != null)
                     {
-                        Next.Target = _value;
+                        _valueSubscription = StartListeningCore();
                     }
                 }
             }
         }
 
-        public WeakReference CurrentValue
+        public IDisposable Subscribe(IObserver<object> observer)
         {
-            get
+            if (_observer != null)
             {
-                return _value;
+                throw new AvaloniaInternalException("ExpressionNode can only be subscribed once.");
             }
 
-            set
+            _observer = observer;
+            var nextSubscription = Next?.Subscribe(this);
+            _valueSubscription = StartListeningCore();
+
+            return Disposable.Create(() =>
             {
-                _value = value;
+                _valueSubscription?.Dispose();
+                _valueSubscription = null;
+                nextSubscription?.Dispose();
+                _observer = null;
+            });
+        }
 
-                if (Next != null)
+        void IObserver<object>.OnCompleted()
-                {
+        {
-                    Next.Target = value;
+            throw new AvaloniaInternalException("ExpressionNode.OnCompleted should not be called.");
-                }
+        }
 
-                _subject?.OnNext(value.Target);
+        void IObserver<object>.OnError(Exception error)
-            }
+        {
+            throw new AvaloniaInternalException("ExpressionNode.OnError should not be called.");
         }
 
-        public virtual bool SetValue(object value, BindingPriority priority)
+        void IObserver<object>.OnNext(object value)
         {
-            return Next?.SetValue(value, priority) ?? false;
+            NextValueChanged(value);
         }
 
-        public virtual IDisposable Subscribe(IObserver<object> observer)
+        protected virtual IObservable<object> StartListening(WeakReference reference)
         {
-            if (Next != null)
+            return Observable.Return(reference.Target);
+        }
+
+        protected virtual void NextValueChanged(object value)
+        {
+            _observer.OnNext(value);
+        }
+
+        private IDisposable StartListeningCore()
+        {
+            var target = _target.Target;
+            IObservable<object> source;
+
+            if (target == null)
+            {
+                source = Observable.Return(TargetNullNotification());
+            }
+            else if (target == AvaloniaProperty.UnsetValue)
             {
-                return Next.Subscribe(observer);
+                source = Observable.Empty<object>();
             }
             else
             {
-                if (_subject == null)
+                source = StartListening(_target);
-                {
-                    _subject = new Subject<object>();
-                }
-
-                observer.OnNext(CurrentValue.Target);
-                return _subject.Subscribe(observer);
             }
+
+            return source.Subscribe(TargetValueChanged);
         }
 
-        protected virtual void SubscribeAndUpdate(WeakReference reference)
+        private void TargetValueChanged(object value)
         {
-            CurrentValue = reference;
+            var notification = value as BindingNotification;
+
+            if (notification == null)
+            {
+                if (Next != null)
+                {
+                    Next.Target = new WeakReference(value);
+                }
+                else
+                {
+                    _observer.OnNext(value);
+                }
+            }
+            else
+            {
+                if (notification.Error != null)
+                {
+                    _observer.OnNext(notification);
+                }
+                else if (notification.HasValue)
+                {
+                    if (Next != null)
+                    {
+                        Next.Target = new WeakReference(notification.Value);
+                    }
+                    else
+                    {
+                        _observer.OnNext(value);
+                    }
+                }
+            }
         }
 
-        protected virtual void Unsubscribe(object target)
+        private BindingNotification TargetNullNotification()
         {
+            // TODO: Work out a way to give a more useful error message here.
+            return new BindingNotification(new NullReferenceException(), BindingErrorType.Error);
         }
     }
 }

src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Reactive.Subjects;
 using Avalonia.Data;
 using Avalonia.Markup.Data.Plugins;
 
@@ -38,15 +39,11 @@ namespace Avalonia.Markup.Data
                 ExceptionValidationPlugin.Instance,
             };
 
-        private readonly WeakReference _root;
+        private static readonly object UninitializedValue = new object();
-        private readonly Func<object> _rootGetter;
-        private readonly IObservable<object> _rootObservable;
-        private readonly IObservable<Unit> _update;
-        private IDisposable _rootObserverSubscription;
-        private IDisposable _updateSubscription;
-        private int _count;
         private readonly ExpressionNode _node;
-        private bool _enableDataValidation;
+        private readonly Subject<Unit> _finished;
+        private readonly object _root;
+        private IObservable<object> _result;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionObserver"/> class.
@@ -58,15 +55,9 @@ namespace Avalonia.Markup.Data
         {
             Contract.Requires<ArgumentNullException>(expression != null);
 
-            _root = new WeakReference(root);
-            _enableDataValidation = enableDataValidation;
-
-            if (!string.IsNullOrWhiteSpace(expression))
-            {
-                _node = ExpressionNodeBuilder.Build(expression, enableDataValidation);
-            }
-
             Expression = expression;
+            _node = Parse(expression, enableDataValidation);
+            _root = new WeakReference(root);
         }
 
         /// <summary>
@@ -83,15 +74,10 @@ namespace Avalonia.Markup.Data
             Contract.Requires<ArgumentNullException>(rootObservable != null);
             Contract.Requires<ArgumentNullException>(expression != null);
 
-            _rootObservable = rootObservable;
-            _enableDataValidation = enableDataValidation;
-
-            if (!string.IsNullOrWhiteSpace(expression))
-            {
-                _node = ExpressionNodeBuilder.Build(expression, enableDataValidation);
-            }
-
             Expression = expression;
+            _node = Parse(expression, enableDataValidation);
+            _finished = new Subject<Unit>();
+            _root = rootObservable;
         }
 
         /// <summary>
@@ -111,16 +97,12 @@ namespace Avalonia.Markup.Data
             Contract.Requires<ArgumentNullException>(expression != null);
             Contract.Requires<ArgumentNullException>(update != null);
 
-            _rootGetter = rootGetter;
-            _update = update;
-            _enableDataValidation = enableDataValidation;
-
-            if (!string.IsNullOrWhiteSpace(expression))
-            {
-                _node = ExpressionNodeBuilder.Build(expression, enableDataValidation);
-            }
-
             Expression = expression;
+            _node = Parse(expression, enableDataValidation);
+            _finished = new Subject<Unit>();
+
+            _node.Target = new WeakReference(rootGetter());
+            _root = update.Select(x => rootGetter());
         }
 
         /// <summary>
@@ -134,21 +116,7 @@ namespace Avalonia.Markup.Data
         /// </returns>
         public bool SetValue(object value, BindingPriority priority = BindingPriority.LocalValue)
         {
-            IncrementCount();
+            return (Leaf as PropertyAccessorNode)?.SetTargetValue(value, priority) ?? false;
-
-            if (_rootGetter != null && _node != null)
-            {
-                _node.Target = new WeakReference(_rootGetter());
-            }
-
-            try
-            {
-                return _node?.SetValue(value, priority) ?? false;
-            }
-            finally
-            {
-                DecrementCount();
-            }
         }
 
         /// <summary>
@@ -160,42 +128,11 @@ namespace Avalonia.Markup.Data
         /// Gets the type of the expression result or null if the expression could not be 
         /// evaluated.
         /// </summary>
-        public Type ResultType
+        public Type ResultType => (Leaf as PropertyAccessorNode)?.PropertyType;
-        {
-            get
-            {
-                IncrementCount();
-
-                try
-                {
-                    if (_node != null)
-                    {
-                        return (Leaf as PropertyAccessorNode)?.PropertyType;
-                    }
-                    else if (_rootGetter != null)
-                    {
-                        return _rootGetter()?.GetType();
-                    }
-                    else
-                    {
-                        return _root.Target?.GetType();
-                    }
-                }
-                finally
-                {
-                    DecrementCount();
-                }
-            }
-        }
 
         /// <inheritdoc/>
         string IDescription.Description => Expression;
 
-        /// <summary>
-        /// Gets the root expression node. Used for testing.
-        /// </summary>
-        internal ExpressionNode Node => _node;
-
         /// <summary>
         /// Gets the leaf node.
         /// </summary>
@@ -212,94 +149,51 @@ namespace Avalonia.Markup.Data
         /// <inheritdoc/>
         protected override IDisposable SubscribeCore(IObserver<object> observer)
         {
-            IncrementCount();
+            if (_result == null)
-
-            if (_node != null)
             {
-                IObservable<object> source = _node;
+                var source = (IObservable<object>)_node;
 
-                if (_rootObservable != null)
+                if (_finished != null)
                 {
-                    source = source.TakeUntil(_rootObservable.LastOrDefaultAsync());
+                    source = source.TakeUntil(_finished);
                 }
-                else if (_update != null)
-                {
-                    source = source.TakeUntil(_update.LastOrDefaultAsync());
-                }
-
-                var subscription = source.Subscribe(observer);
 
-                return Disposable.Create(() =>
+                _result = Observable.Using(StartRoot, _ => source)
-                {
+                    .Publish(UninitializedValue)
-                    DecrementCount();
+                    .RefCount()
-                    subscription.Dispose();
+                    .Where(x => x != UninitializedValue);
-                });
             }
-            else if (_rootObservable != null)
+
+            return _result.Subscribe(observer);
+        }
+
+        private static ExpressionNode Parse(string expression, bool enableDataValidation)
+        {
+            if (!string.IsNullOrWhiteSpace(expression))
             {
-                return _rootObservable.Subscribe(observer);
+                return ExpressionNodeBuilder.Build(expression, enableDataValidation);
             }
             else
             {
-                if (_update == null)
+                return new EmptyExpressionNode();
-                {
-                    return Observable.Never<object>()
-                        .StartWith(_root.Target)
-                        .Subscribe(observer);
-                }
-                else
-                {
-                    return _update
-                        .Select(_ => _rootGetter())
-                        .StartWith(_rootGetter())
-                        .Subscribe(observer);
-                }
             }
         }
 
-        private void IncrementCount()
+        private IDisposable StartRoot()
         {
-            if (_count++ == 0 && _node != null)
+            var observable = _root as IObservable<object>;
-            {
-                if (_rootGetter != null)
-                {
-                    _node.Target = new WeakReference(_rootGetter());
 
-                    if (_update != null)
+            if (observable != null)
-                    {
+            {
-                        _updateSubscription = _update.Subscribe(x =>
+                return observable.Subscribe(
-                            _node.Target = new WeakReference(_rootGetter()));
+                    x => _node.Target = new WeakReference(x),
-                    }
+                    _ => _finished.OnNext(Unit.Default),
-                }
+                    () => _finished.OnNext(Unit.Default));
-                else if (_rootObservable != null)
-                {
-                    _rootObserverSubscription = _rootObservable.Subscribe(x =>
-                        _node.Target = new WeakReference(x));
-                }
-                else
-                {
-                    _node.Target = _root;
-                }
             }
-        }
+            else
-
-        private void DecrementCount()
-        {
-            if (--_count == 0 && _node != null)
             {
-                if (_rootObserverSubscription != null)
+                _node.Target = (WeakReference)_root;
-                {
+                return Disposable.Empty;
-                    _rootObserverSubscription.Dispose();
-                    _rootObserverSubscription = null;
-                }
-
-                if (_updateSubscription != null)
-                {
-                    _updateSubscription.Dispose();
-                    _updateSubscription = null;
-                }
-
-                _node.Target = null;
             }
         }
     }

src/Markup/Avalonia.Markup/Data/IndexerNode.cs

@@ -10,130 +10,47 @@ using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Reactive.Linq;
 
 namespace Avalonia.Markup.Data
 {
-    internal class IndexerNode : ExpressionNode, 
+    internal class IndexerNode : ExpressionNode
-        IWeakSubscriber<NotifyCollectionChangedEventArgs>,
-        IWeakSubscriber<PropertyChangedEventArgs>
     {
         public IndexerNode(IList<string> arguments)
         {
             Arguments = arguments;
         }
 
-        public IList<string> Arguments { get; }
+        protected override IObservable<object> StartListening(WeakReference reference)
-
-        void IWeakSubscriber<NotifyCollectionChangedEventArgs>.OnEvent(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            var update = false;
-            if (sender is IList)
-            {
-                object indexObject;
-                if (!TypeUtilities.TryConvert(typeof(int), Arguments[0], CultureInfo.InvariantCulture, out indexObject))
-                {
-                    return;
-                }
-                var index = (int)indexObject;
-                switch (e.Action)
-                {
-                    case NotifyCollectionChangedAction.Add:
-                        update = index >= e.NewStartingIndex;
-                        break;
-                    case NotifyCollectionChangedAction.Remove:
-                        update = index >= e.OldStartingIndex;
-                        break;
-                    case NotifyCollectionChangedAction.Replace:
-                        update = index >= e.NewStartingIndex &&
-                                 index < e.NewStartingIndex + e.NewItems.Count;
-                        break;
-                    case NotifyCollectionChangedAction.Move:
-                        update = (index >= e.NewStartingIndex &&
-                                  index < e.NewStartingIndex + e.NewItems.Count) ||
-                                 (index >= e.OldStartingIndex &&
-                                 index < e.OldStartingIndex + e.OldItems.Count);
-                        break;
-                    case NotifyCollectionChangedAction.Reset:
-                        update = true;
-                        break;
-                }
-            }
-            else
-            {
-                update = true;
-            }
-
-            if (update)
-            {
-                CurrentValue = new WeakReference(GetValue(sender));
-            }
-        }
-
-        void IWeakSubscriber<PropertyChangedEventArgs>.OnEvent(object sender, PropertyChangedEventArgs e)
         {
-            var typeInfo = sender.GetType().GetTypeInfo();
+            var target = reference.Target;
-
-            if (typeInfo.GetDeclaredProperty(e.PropertyName) == null)
-            {
-                return;
-            }
-
-            if (typeInfo.GetDeclaredProperty(e.PropertyName).GetIndexParameters().Any())
-            {
-                CurrentValue = new WeakReference(GetValue(sender));
-            }
-        }
-
-        protected override void SubscribeAndUpdate(WeakReference reference)
-        {
-            object target = reference.Target;
-
-            CurrentValue = new WeakReference(GetValue(target));
-
             var incc = target as INotifyCollectionChanged;
-
-            if (incc != null)
-            {
-                WeakSubscriptionManager.Subscribe<NotifyCollectionChangedEventArgs>(
-                    incc,
-                    nameof(incc.CollectionChanged),
-                    this);
-            }
-
             var inpc = target as INotifyPropertyChanged;
-
+            var inputs = new List<IObservable<object>>();
-            if (inpc != null)
-            {
-                WeakSubscriptionManager.Subscribe<PropertyChangedEventArgs>(
-                    inpc,
-                    nameof(inpc.PropertyChanged),
-                    this);
-            }
-        }
-
-        protected override void Unsubscribe(object target)
-        {
-            var incc = target as INotifyCollectionChanged;
 
             if (incc != null)
             {
-                WeakSubscriptionManager.Unsubscribe<NotifyCollectionChangedEventArgs>(
+                inputs.Add(WeakObservable.FromEventPattern<NotifyCollectionChangedEventArgs>(
-                    incc,
+                    target,
-                    nameof(incc.CollectionChanged),
+                    nameof(incc.CollectionChanged))
-                    this);
+                    .Where(x => ShouldUpdate(x.Sender, x.EventArgs))
+                    .Select(_ => GetValue(target)));
             }
 
-            var inpc = target as INotifyPropertyChanged;
-
             if (inpc != null)
             {
-                WeakSubscriptionManager.Unsubscribe<PropertyChangedEventArgs>(
+                inputs.Add(WeakObservable.FromEventPattern<PropertyChangedEventArgs>(
-                    inpc,
+                    target,
-                    nameof(inpc.PropertyChanged),
+                    nameof(inpc.PropertyChanged))
-                    this);
+                    .Where(x => ShouldUpdate(x.Sender, x.EventArgs))
+                    .Select(_ => GetValue(target)));
             }
+
+            return Observable.Merge(inputs).StartWith(GetValue(target));
         }
 
+        public IList<string> Arguments { get; }
+
         private object GetValue(object target)
         {
             var typeInfo = target.GetType().GetTypeInfo();
@@ -141,18 +58,23 @@ namespace Avalonia.Markup.Data
             var dictionary = target as IDictionary;
             var indexerProperty = GetIndexer(typeInfo);
             var indexerParameters = indexerProperty?.GetIndexParameters();
+
             if (indexerProperty != null && indexerParameters.Length == Arguments.Count)
             {
                 var convertedObjectArray = new object[indexerParameters.Length];
+
                 for (int i = 0; i < Arguments.Count; i++)
                 {
                     object temp = null;
+
                     if (!TypeUtilities.TryConvert(indexerParameters[i].ParameterType, Arguments[i], CultureInfo.InvariantCulture, out temp))
                     {
                         return AvaloniaProperty.UnsetValue;
                     }
+
                     convertedObjectArray[i] = temp;
                 }
+
                 var intArgs = convertedObjectArray.OfType<int>().ToArray();
 
                 // Try special cases where we can validate indicies
@@ -166,16 +88,18 @@ namespace Avalonia.Markup.Data
                     {
                         if (intArgs.Length == Arguments.Count && intArgs[0] >= 0 && intArgs[0] < list.Count)
                         {
-                            return list[intArgs[0]]; 
+                            return list[intArgs[0]];
                         }
+
                         return AvaloniaProperty.UnsetValue;
                     }
                     else if (dictionary != null)
                     {
                         if (dictionary.Contains(convertedObjectArray[0]))
                         {
-                            return dictionary[convertedObjectArray[0]]; 
+                            return dictionary[convertedObjectArray[0]];
                         }
+
                         return AvaloniaProperty.UnsetValue;
                     }
                     else
@@ -187,11 +111,11 @@ namespace Avalonia.Markup.Data
                 else
                 {
                     // Fallback to unchecked access
-                    return indexerProperty.GetValue(target, convertedObjectArray); 
+                    return indexerProperty.GetValue(target, convertedObjectArray);
                 }
             }
             // Multidimensional arrays end up here because the indexer search picks up the IList indexer instead of the
-            //  multidimensional indexer, which doesn't take the same number of arguments
+            // multidimensional indexer, which doesn't take the same number of arguments
             else if (typeInfo.IsArray)
             {
                 return GetValueFromArray((Array)target);
@@ -220,13 +144,16 @@ namespace Avalonia.Markup.Data
         private bool ConvertArgumentsToInts(out int[] intArgs)
         {
             intArgs = new int[Arguments.Count];
+
             for (int i = 0; i < Arguments.Count; ++i)
             {
                 object value;
+
                 if (!TypeUtilities.TryConvert(typeof(int), Arguments[i], CultureInfo.InvariantCulture, out value))
                 {
                     return false;
                 }
+
                 intArgs[i] = (int)value;
             }
             return true;
@@ -235,7 +162,8 @@ namespace Avalonia.Markup.Data
         private static PropertyInfo GetIndexer(TypeInfo typeInfo)
         {
             PropertyInfo indexer;
-            for (;typeInfo != null; typeInfo = typeInfo.BaseType?.GetTypeInfo())
+
+            for (; typeInfo != null; typeInfo = typeInfo.BaseType?.GetTypeInfo())
             {
                 // Check for the default indexer name first to make this faster.
                 // This will only be false when a class in VB has a custom indexer name.
@@ -243,14 +171,16 @@ namespace Avalonia.Markup.Data
                 {
                     return indexer;
                 }
+
                 foreach (var property in typeInfo.DeclaredProperties)
                 {
                     if (property.GetIndexParameters().Any())
                     {
                         return property;
                     }
-                } 
+                }
             }
+
             return null;
         }
 
@@ -273,5 +203,46 @@ namespace Avalonia.Markup.Data
                 return false;
             }
         }
+
+        private bool ShouldUpdate(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (sender is IList)
+            {
+                object indexObject;
+
+                if (!TypeUtilities.TryConvert(typeof(int), Arguments[0], CultureInfo.InvariantCulture, out indexObject))
+                {
+                    return false;
+                }
+
+                var index = (int)indexObject;
+
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        return index >= e.NewStartingIndex;
+                    case NotifyCollectionChangedAction.Remove:
+                        return index >= e.OldStartingIndex;
+                    case NotifyCollectionChangedAction.Replace:
+                        return index >= e.NewStartingIndex &&
+                               index < e.NewStartingIndex + e.NewItems.Count;
+                    case NotifyCollectionChangedAction.Move:
+                        return (index >= e.NewStartingIndex &&
+                                index < e.NewStartingIndex + e.NewItems.Count) ||
+                               (index >= e.OldStartingIndex &&
+                                index < e.OldStartingIndex + e.OldItems.Count);
+                    case NotifyCollectionChangedAction.Reset:
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool ShouldUpdate(object sender, PropertyChangedEventArgs e)
+        {
+            var typeInfo = sender.GetType().GetTypeInfo();
+            return typeInfo.GetDeclaredProperty(e.PropertyName)?.GetIndexParameters().Any() ?? false;
+        }
     }
 }

src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs

@@ -3,21 +3,15 @@
 
 using System;
 using System.Globalization;
-using System.Reactive.Linq;
 using Avalonia.Data;
 
 namespace Avalonia.Markup.Data
 {
     internal class LogicalNotNode : ExpressionNode
     {
-        public override bool SetValue(object value, BindingPriority priority)
+        protected override void NextValueChanged(object value)
         {
-            return false;
+            base.NextValueChanged(Negate(value));
-        }
-
-        public override IDisposable Subscribe(IObserver<object> observer)
-        {
-            return Next.Select(Negate).Subscribe(observer);
         }
 
         private static object Negate(object v)
@@ -34,6 +28,12 @@ namespace Avalonia.Markup.Data
                     {
                         return !result;
                     }
+                    else
+                    {
+                        return new BindingNotification(
+                            new InvalidCastException($"Unable to convert '{s}' to bool."), 
+                            BindingErrorType.Error);
+                    }
                 }
                 else
                 {
@@ -42,9 +42,17 @@ namespace Avalonia.Markup.Data
                         var boolean = Convert.ToBoolean(v, CultureInfo.InvariantCulture);
                         return !boolean;
                     }
-                    catch
+                    catch (InvalidCastException)
+                    {
+                        // The error message here is "Unable to cast object of type 'System.Object'
+                        // to type 'System.IConvertible'" which is kinda useless so provide our own.
+                        return new BindingNotification(
+                            new InvalidCastException($"Unable to convert '{v}' to bool."),
+                            BindingErrorType.Error);
+                    }
+                    catch (Exception e)
                     {
-                        // TODO: Maybe should log something here.
+                        return new BindingNotification(e, BindingErrorType.Error);
                     }
                 }
             }

src/Markup/Avalonia.Markup/Data/PropertyAccessorNode.cs

@@ -3,22 +3,17 @@
 
 using System;
 using System.Linq;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Input;
 using Avalonia.Data;
-using Avalonia.Logging;
 using Avalonia.Markup.Data.Plugins;
 
 namespace Avalonia.Markup.Data
 {
-    internal class PropertyAccessorNode : ExpressionNode, IObserver<object>
+    internal class PropertyAccessorNode : ExpressionNode
     {
-        private IPropertyAccessor _accessor;
-        private IDisposable _subscription;
         private bool _enableValidation;
+        private IPropertyAccessor _accessor;
 
         public PropertyAccessorNode(string propertyName, bool enableValidation)
         {
@@ -30,120 +25,40 @@ namespace Avalonia.Markup.Data
 
         public Type PropertyType => _accessor?.PropertyType;
 
-        public override bool SetValue(object value, BindingPriority priority)
+        public bool SetTargetValue(object value, BindingPriority priority)
         {
-            if (Next != null)
+            if (_accessor != null)
             {
-                return Next.SetValue(value, priority);
+                try { return _accessor.SetValue(value, priority); } catch { }
-            }
-            else
-            {
-                if (_accessor != null)
-                {
-                    try { return _accessor.SetValue(value, priority); } catch { }
-                }
-
-                return false;
             }
-        }
-
-        void IObserver<object>.OnCompleted()
-        {
-            // Should not be called by IPropertyAccessor.
-        }
 
-        void IObserver<object>.OnError(Exception error)
+            return false;
-        {
-            // Should not be called by IPropertyAccessor.
-        }
-
-        void IObserver<object>.OnNext(object value)
-        {
-            SetCurrentValue(value);
         }
 
-        protected override void SubscribeAndUpdate(WeakReference reference)
+        protected override IObservable<object> StartListening(WeakReference reference)
         {
-            var instance = reference.Target;
+            var plugin = ExpressionObserver.PropertyAccessors.FirstOrDefault(x => x.Match(reference));
+            var accessor = plugin?.Start(reference, PropertyName);
 
-            if (instance != null && instance != AvaloniaProperty.UnsetValue)
+            if (_enableValidation && Next == null)
             {
-                var plugin = ExpressionObserver.PropertyAccessors.FirstOrDefault(x => x.Match(reference));
+                foreach (var validator in ExpressionObserver.DataValidators)
-                var accessor = plugin?.Start(reference, PropertyName);
-
-                if (_enableValidation)
                 {
-                    foreach (var validator in ExpressionObserver.DataValidators)
+                    if (validator.Match(reference))
                     {
-                        if (validator.Match(reference))
+                        accessor = validator.Start(reference, PropertyName, accessor);
-                        {
-                            accessor = validator.Start(reference, PropertyName, accessor);
-                        }
                     }
                 }
-
-                _accessor = accessor;
-                _accessor.Subscribe(this);
-            }
-            else
-            {
-                CurrentValue = UnsetReference;
-            }
-        }
-
-        protected override void Unsubscribe(object target)
-        {
-            _accessor?.Dispose();
-            _accessor = null;
-        }
-
-        private void SetCurrentValue(object value)
-        {
-            var observable = value as IObservable<object>;
-            var command = value as ICommand;
-            var task = value as Task;
-            bool set = false;
-
-            // HACK: ReactiveCommand is an IObservable but we want to bind to it, not its value.
-            // We may need to make this a more general solution.
-            if (observable != null && command == null)
-            {
-                CurrentValue = UnsetReference;
-                set = true;
-                _subscription = observable
-                    .ObserveOn(SynchronizationContext.Current)
-                    .Subscribe(x => CurrentValue = new WeakReference(x));
             }
-            else if (task != null)
-            {
-                var resultProperty = task.GetType().GetTypeInfo().GetDeclaredProperty("Result");
 
-                if (resultProperty != null)
+            // Ensure that _accessor is set for the duration of the subscription.
+            return Observable.Using(
+                () =>
                 {
-                    if (task.Status == TaskStatus.RanToCompletion)
+                    _accessor = accessor;
-                    {
+                    return Disposable.Create(() => _accessor = null);
-                        CurrentValue = new WeakReference(resultProperty.GetValue(task));
+                },
-                        set = true;
+                _ => accessor);
-                    }
-                    else
-                    {
-                        task.ContinueWith(
-                                x => CurrentValue = new WeakReference(resultProperty.GetValue(task)),
-                                TaskScheduler.FromCurrentSynchronizationContext())
-                            .ConfigureAwait(false);
-                    }
-                }
-            }
-            else
-            {
-                CurrentValue = new WeakReference(value);
-                set = true;
-            }
-
-            if (!set)
-            {
-                CurrentValue = UnsetReference;
-            }
         }
     }
 }

tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj

@@ -85,6 +85,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ControlLocatorTests.cs" />
+    <Compile Include="Data\IndeiBase.cs" />
     <Compile Include="Data\Plugins\IndeiValidationPluginTests.cs" />
     <Compile Include="Data\Plugins\ExceptionValidationPluginTests.cs" />
     <Compile Include="Data\ExpressionNodeBuilderTests.cs" />
@@ -100,7 +101,6 @@
     <Compile Include="Data\ExpressionObserverTests_Task.cs" />
     <Compile Include="Data\ExpressionObserverTests_DataValidation.cs" />
     <Compile Include="Data\ExpressionSubjectTests.cs" />
-    <Compile Include="Data\IndeiValidatorTests.cs" />
     <Compile Include="DefaultValueConverterTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnitTestSynchronizationContext.cs" />

tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs

@@ -4,10 +4,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Runtime.CompilerServices;
 using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
@@ -106,6 +104,48 @@ namespace Avalonia.Markup.UnitTests.Data
             }, result);
         }
 
+        [Fact]
+        public void Doesnt_Subscribe_To_Indei_Of_Intermediate_Object_In_Chain()
+        {
+            var data = new Container
+            {
+                Inner = new IndeiTest()
+            };
+
+            var observer = new ExpressionObserver(
+                data,
+                $"{nameof(Container.Inner)}.{nameof(IndeiTest.MustBePositive)}",
+                true);
+
+            observer.Subscribe(_ => { });
+
+            // We may want to change this but I've never seen an example of data validation on an
+            // intermediate object in a chain so for the moment I'm not sure what the result of 
+            // validating such a thing should look like.
+            Assert.Equal(0, data.ErrorsChangedSubscriptionCount);
+            Assert.Equal(1, ((IndeiTest)data.Inner).ErrorsChangedSubscriptionCount);
+        }
+
+        [Fact]
+        public void Sends_Correct_Notifications_With_Property_Chain()
+        {
+            var container = new Container();
+            var inner = new IndeiTest();
+
+            var observer = new ExpressionObserver(
+                container,
+                $"{nameof(Container.Inner)}.{nameof(IndeiTest.MustBePositive)}",
+                true);
+            var result = new List<object>();
+
+            observer.Subscribe(x => result.Add(x));
+
+            Assert.Equal(new[]
+            {
+                new BindingNotification(new NullReferenceException(), BindingErrorType.Error),
+            }, result);
+        }
+
         public class ExceptionTest : NotifyingBase
         {
             private int _mustBePositive;
@@ -161,5 +201,19 @@ namespace Avalonia.Markup.UnitTests.Data
                 return result;
             }
         }
+
+        private class Container : IndeiBase
+        {
+            private object _inner;
+
+            public object Inner
+            {
+                get { return _inner; }
+                set { _inner = value; RaisePropertyChanged(); }
+            }
+
+            public override bool HasErrors => false;
+            public override IEnumerable GetErrors(string propertyName) => null;
+        }
     }
 }

tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Indexer.cs

@@ -215,7 +215,7 @@ namespace Avalonia.Markup.UnitTests.Data
         {
             Func<Tuple<ExpressionObserver, WeakReference>> run = () =>
             {
-                var source = new NonIntegerIndexer();
+                var source = new { Foo = new NonIntegerIndexer() };
                 var target = new ExpressionObserver(source, "Foo");
                 return Tuple.Create(target, new WeakReference(source));
             };

tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Lifetime.cs

@@ -27,6 +27,19 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.True(completed);
         }
 
+        [Fact]
+        public void Should_Complete_When_Source_Observable_Errors()
+        {
+            var source = new BehaviorSubject<object>(1);
+            var target = new ExpressionObserver(source, "Foo");
+            var completed = false;
+
+            target.Subscribe(_ => { }, () => completed = true);
+            source.OnError(new Exception());
+
+            Assert.True(completed);
+        }
+
         [Fact]
         public void Should_Complete_When_Update_Observable_Completes()
         {
@@ -40,6 +53,19 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.True(completed);
         }
 
+        [Fact]
+        public void Should_Complete_When_Update_Observable_Errors()
+        {
+            var update = new Subject<Unit>();
+            var target = new ExpressionObserver(() => 1, "Foo", update);
+            var completed = false;
+
+            target.Subscribe(_ => { }, () => completed = true);
+            update.OnError(new Exception());
+
+            Assert.True(completed);
+        }
+
         [Fact]
         public void Should_Unsubscribe_From_Source_Observable()
         {
@@ -55,7 +81,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 scheduler.Start();
             }
 
-            Assert.Equal(new[] { AvaloniaProperty.UnsetValue, "foo" }, result);
+            Assert.Equal(new[] { "foo" }, result);
             Assert.All(source.Subscriptions, x => Assert.NotEqual(Subscription.Infinite, x.Unsubscribe));
         }
 
@@ -77,22 +103,6 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.All(update.Subscriptions, x => Assert.NotEqual(Subscription.Infinite, x.Unsubscribe));
         }
 
-        [Fact]
-        public void Should_Set_Node_Target_To_Null_On_Unsubscribe()
-        {
-            var target = new ExpressionObserver(new { Foo = "foo" }, "Foo");
-            var result = new List<object>();
-
-            using (target.Subscribe(x => result.Add(x)))
-            using (target.Subscribe(_ => { }))
-            {
-                Assert.NotNull(target.Node.Target);
-            }
-
-            Assert.Equal(new[] { "foo" }, result);
-            Assert.Null(target.Node.Target);
-        }
-
         private Recorded<Notification<object>> OnNext(long time, object value)
         {
             return new Recorded<Notification<object>>(time, Notification.CreateOnNext<object>(value));

tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Reactive.Linq;
+using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Xunit;
 
@@ -61,23 +62,31 @@ namespace Avalonia.Markup.UnitTests.Data
         }
 
         [Fact]
-        public async void Should_Return_UnsetValue_For_String_Not_Convertible_To_Boolean()
+        public async void Should_Return_BindingNotification_For_String_Not_Convertible_To_Boolean()
         {
             var data = new { Foo = "foo" };
             var target = new ExpressionObserver(data, "!Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(AvaloniaProperty.UnsetValue, result);
+            Assert.Equal(
+                new BindingNotification(
+                    new InvalidCastException($"Unable to convert 'foo' to bool."),
+                    BindingErrorType.Error), 
+                result);
         }
 
         [Fact]
-        public async void Should_Return_Empty_For_Value_Not_Convertible_To_Boolean()
+        public async void Should_Return_BindingNotification_For_Value_Not_Convertible_To_Boolean()
         {
             var data = new { Foo = new object() };
             var target = new ExpressionObserver(data, "!Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(AvaloniaProperty.UnsetValue, result);
+            Assert.Equal(
+                new BindingNotification(
+                    new InvalidCastException($"Unable to convert 'System.Object' to bool."),
+                    BindingErrorType.Error),
+                result);
         }
 
         [Fact]

tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Property.cs

@@ -32,6 +32,8 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new { Foo = "foo" };
             var target = new ExpressionObserver(data, "Foo");
 
+            target.Subscribe(_ => { });
+
             Assert.Equal(typeof(string), target.ResultType);
         }
 
@@ -71,6 +73,8 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new { Foo = new { Bar = new { Baz = "baz" } } };
             var target = new ExpressionObserver(data, "Foo.Bar.Baz");
 
+            target.Subscribe(_ => { });
+
             Assert.Equal(typeof(string), target.ResultType);
         }
 
@@ -88,6 +92,23 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.Equal("Could not find CLR property 'Baz' on '1'", error.Error.Message);
         }
 
+        [Fact]
+        public void Should_Return_BindingNotification_Error_For_Chain_With_Null_Value()
+        {
+            var data = new { Foo = default(object) };
+            var target = new ExpressionObserver(data, "Foo.Bar.Baz");
+            var result = new List<object>();
+
+            target.Subscribe(x => result.Add(x));
+
+            Assert.Equal(1, result.Count);
+            Assert.IsType<BindingNotification>(result[0]);
+
+            var error = result[0] as BindingNotification;
+            Assert.IsType<NullReferenceException>(error.Error);
+            Assert.Equal("Object reference not set to an instance of an object.", error.Error.Message);
+        }
+
         [Fact]
         public void Should_Have_Null_ResultType_For_Broken_Chain()
         {
@@ -151,8 +172,9 @@ namespace Avalonia.Markup.UnitTests.Data
 
             var sub = target.Subscribe(x => result.Add(x));
             ((Class2)data.Next).Bar = "baz";
+            ((Class2)data.Next).Bar = null;
 
-            Assert.Equal(new[] { "bar", "baz" }, result);
+            Assert.Equal(new[] { "bar", "baz", null }, result);
 
             sub.Dispose();
 
@@ -170,8 +192,9 @@ namespace Avalonia.Markup.UnitTests.Data
             var sub = target.Subscribe(x => result.Add(x));
             var old = data.Next;
             data.Next = new Class2 { Bar = "baz" };
+            data.Next = new Class2 { Bar = null };
 
-            Assert.Equal(new[] { "bar", "baz" }, result);
+            Assert.Equal(new[] { "bar", "baz", null }, result);
 
             sub.Dispose();
 
@@ -192,7 +215,14 @@ namespace Avalonia.Markup.UnitTests.Data
             data.Next = null;
             data.Next = new Class2 { Bar = "baz" };
 
-            Assert.Equal(new[] { "bar", AvaloniaProperty.UnsetValue, "baz" }, result);
+            Assert.Equal(
+                new object[] 
+                {
+                    "bar",
+                    new BindingNotification(new NullReferenceException(), BindingErrorType.Error),
+                    "baz"
+                }, 
+                result);
 
             sub.Dispose();
 
@@ -258,17 +288,59 @@ namespace Avalonia.Markup.UnitTests.Data
                 scheduler.Start();
             }
 
-            Assert.Equal(new[] { AvaloniaProperty.UnsetValue, "foo", "bar" }, result);
+            Assert.Equal(new[] { "foo", "bar" }, result);
             Assert.All(source.Subscriptions, x => Assert.NotEqual(Subscription.Infinite, x.Unsubscribe));
         }
 
+        [Fact]
+        public void Subscribing_Multiple_Times_Should_Return_Values_To_All()
+        {
+            var data = new Class1 { Foo = "foo" };
+            var target = new ExpressionObserver(data, "Foo");
+            var result1 = new List<object>();
+            var result2 = new List<object>();
+            var result3 = new List<object>();
+
+            target.Subscribe(x => result1.Add(x));
+            target.Subscribe(x => result2.Add(x));
+
+            data.Foo = "bar";
+
+            target.Subscribe(x => result3.Add(x));
+
+            Assert.Equal(new[] { "foo", "bar" }, result1);
+            Assert.Equal(new[] { "foo", "bar" }, result2);
+            Assert.Equal(new[] { "bar" }, result3);
+        }
+
+        [Fact]
+        public void Subscribing_Multiple_Times_Should_Only_Add_PropertyChanged_Handlers_Once()
+        {
+            var data = new Class1 { Foo = "foo" };
+            var target = new ExpressionObserver(data, "Foo");
+
+            var sub1 = target.Subscribe(x => { });
+            var sub2 = target.Subscribe(x => { });
+
+            Assert.Equal(1, data.PropertyChangedSubscriptionCount);
+
+            sub1.Dispose();
+            sub2.Dispose();
+
+            Assert.Equal(0, data.PropertyChangedSubscriptionCount);
+        }
+
         [Fact]
         public void SetValue_Should_Set_Simple_Property_Value()
         {
             var data = new Class1 { Foo = "foo" };
             var target = new ExpressionObserver(data, "Foo");
 
-            Assert.True(target.SetValue("bar"));
+            using (target.Subscribe(_ => { }))
+            {
+                Assert.True(target.SetValue("bar"));
+            }
+
             Assert.Equal("bar", data.Foo);
         }
 
@@ -278,7 +350,11 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new Class1 { Next = new Class2 { Bar = "bar" } };
             var target = new ExpressionObserver(data, "Next.Bar");
 
-            Assert.True(target.SetValue("baz"));
+            using (target.Subscribe(_ => { }))
+            {
+                Assert.True(target.SetValue("baz"));
+            }
+
             Assert.Equal("baz", ((Class2)data.Next).Bar);
         }
 
@@ -288,7 +364,10 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new Class1 { Next = new WithoutBar()};
             var target = new ExpressionObserver(data, "Next.Bar");
 
-            Assert.False(target.SetValue("baz"));
+            using (target.Subscribe(_ => { }))
+            {
+                Assert.False(target.SetValue("baz"));
+            }
         }
 
         [Fact]
@@ -297,7 +376,10 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new Class1();
             var target = new ExpressionObserver(data, "Next.Bar");
 
-            Assert.False(target.SetValue("baz"));
+            using (target.Subscribe(_ => { }))
+            {
+                Assert.False(target.SetValue("baz"));
+            }
         }
 
         [Fact]
@@ -306,7 +388,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new ExpressionObserver((object)null, "Foo");
             var result = await target.Take(1);
 
-            Assert.Equal(AvaloniaProperty.UnsetValue, result);
+            Assert.Equal(new BindingNotification(new NullReferenceException(), BindingErrorType.Error), result);
         }
 
         [Fact]
@@ -325,7 +407,14 @@ namespace Avalonia.Markup.UnitTests.Data
             root = null;
             update.OnNext(Unit.Default);
 
-            Assert.Equal(new[] { "foo", "bar", AvaloniaProperty.UnsetValue }, result);
+            Assert.Equal(
+                new object[] 
+                {
+                    "foo",
+                    "bar",
+                    new BindingNotification(new NullReferenceException(), BindingErrorType.Error)
+                }, 
+                result);
 
             Assert.Equal(0, first.PropertyChangedSubscriptionCount);
             Assert.Equal(0, second.PropertyChangedSubscriptionCount);

tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_SetValue.cs

@@ -18,7 +18,10 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new { Foo = "foo" };
             var target = new ExpressionObserver(data, "Foo");
 
-            target.SetValue("bar");
+            using (target.Subscribe(_ => { }))
+            {
+                target.SetValue("bar");
+            }
 
             Assert.Equal("foo", data.Foo);
         }
@@ -29,7 +32,10 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new Class1 { Foo = new Class2 { Bar = "bar" } };
             var target = new ExpressionObserver(data, "Foo.Bar");
 
-            target.SetValue("foo");
+            using (target.Subscribe(_ => { }))
+            {
+                target.SetValue("foo");
+            }
 
             Assert.Equal("foo", data.Foo.Bar);
         }