PR fix for cases where unsubscriptions could happen in different places on the order list

Author: CoderGamester

Runtime/ObservableDictionary.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using UnityEngine.UIElements;
 
 // ReSharper disable once CheckNamespace
 
@@ -276,18 +275,26 @@ public virtual bool Remove(TKey key)
 
 			if (ObservableUpdateFlag != ObservableUpdateFlag.UpdateOnly && _keyUpdateActions.TryGetValue(key, out var actions))
 			{
-				var listCopy = actions.ToList();
-				for (var i = 0; i < listCopy.Count; i++)
+				for (var i = actions.Count - 1; i > -1; i--)
 				{
-					listCopy[i](key, value, default, ObservableUpdateType.Removed);
+					var action = actions[i];
+
+					action(key, value, default, ObservableUpdateType.Removed);
+
+					// Shift the index if an action was unsubscribed
+					i = AdjustIndex(i, action, actions);
 				}
 			}
 			if (ObservableUpdateFlag != ObservableUpdateFlag.KeyUpdateOnly)
 			{
-				var listCopy = _updateActions.ToList();
-				for (var i = 0; i < listCopy.Count; i++)
+				for (var i = _updateActions.Count - 1; i > -1; i--)
 				{
-					listCopy[i](key, value, default, ObservableUpdateType.Removed);
+					var action = _updateActions[i];
+
+					action(key, value, default, ObservableUpdateType.Removed);
+
+					// Shift the index if an action was unsubscribed
+					i = AdjustIndex(i, action, _updateActions);
 				}
 			}
 
@@ -442,6 +449,25 @@ protected void InvokeUpdate(TKey key, TValue previousValue)
 				}
 			}
 		}
+
+		private int AdjustIndex(int index, Action<TKey, TValue, TValue, ObservableUpdateType> action,
+			IList<Action<TKey, TValue, TValue, ObservableUpdateType>> list)
+		{
+			if (index < list.Count && list[index] == action)
+			{
+				return index;
+			}
+
+			for (var i = index - 1; i > -1; i--)
+			{
+				if (list[index] == action)
+				{
+					return i;
+				}
+			}
+
+			return index + 1;
+		}
 	}
 
 	/// <inheritdoc />

Runtime/ObservableList.cs

@@ -232,9 +232,14 @@ public virtual void RemoveAt(int index)
 
 			List.RemoveAt(index);
 
-			for (var i = 0; i < _updateActions.Count; i++)
+			for (var i = _updateActions.Count - 1; i > -1; i--)
 			{
-				_updateActions[i](index, data, default, ObservableUpdateType.Removed);
+				var action = _updateActions[i];
+
+				action(index, data, default, ObservableUpdateType.Removed);
+
+				// Shift the index if an action was unsubscribed
+				i = AdjustIndex(i, action);
 			}
 		}
 
@@ -307,6 +312,24 @@ protected void InvokeUpdate(int index, T previousValue)
 				_updateActions[i](index, previousValue, data, ObservableUpdateType.Updated);
 			}
 		}
+
+		private int AdjustIndex(int index, Action<int, T, T, ObservableUpdateType> action)
+		{
+			if (index < _updateActions.Count && _updateActions[index] == action)
+			{
+				return index;
+			}
+
+			for (var i = index - 1; i > -1; i--)
+			{
+				if (_updateActions[index] == action)
+				{
+					return i;
+				}
+			}
+
+			return index + 1;
+		}
 	}
 
 	/// <inheritdoc />

Tests/Editor/ObservableDictionaryTest.cs

@@ -3,7 +3,6 @@
 using GameLovers;
 using NSubstitute;
 using NUnit.Framework;
-using UnityEngine;
 
 // ReSharper disable once CheckNamespace
 

Tests/Editor/ObservableListTest.cs

@@ -126,7 +126,7 @@ public void StopObserveCheck()
 		}
 
 		[Test]
-		public void StopObserve_MultipleCalls_StopsOnlyOne()
+		public void StopObserve_WhenCalledOnce_RemovesOnlyOneObserverInstance()
 		{
 			_list.Observe(_caller.Call);
 			_list.Observe(_caller.Call);
@@ -137,7 +137,9 @@ public void StopObserve_MultipleCalls_StopsOnlyOne()
 
 			_list.RemoveAt(_index);
 
-			_caller.Received().Call(Arg.Any<int>(), Arg.Any<int>(), Arg.Any<int>(), Arg.Any<ObservableUpdateType>());
+			_caller.Received(1).Call(Arg.Any<int>(), Arg.Is(0), Arg.Is(_previousValue), ObservableUpdateType.Added);
+			_caller.Received(1).Call(_index, _previousValue, _previousValue, ObservableUpdateType.Updated);
+			_caller.Received(1).Call(_index, _previousValue, 0, ObservableUpdateType.Removed);
 		}
 
 		[Test]