FirstOrOptional extension fix to return Option.None instead of defaul…

…t on value type enumerable (#460) * FirstOrOptional fix to return Option.None instead of default on value types enumerable * return is operator Co-authored-by: Gleb Bakanov <[email protected]>
reactivemarbles · Mar 8, 2021 · 0c216b1 · 0c216b1
1 parent d08495c
commit 0c216b1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/DynamicData/Kernel/OptionExtensions.cs b/src/DynamicData/Kernel/OptionExtensions.cs
@@ -77,8 +77,15 @@ public static Optional<T> FirstOrOptional<T>(this IEnumerable<T> source, Func<T,
                 throw new ArgumentNullException(nameof(source));
             }
 
-            var result = source.FirstOrDefault(selector);
-            return !Equals(result, null) ? result : Optional.None<T>();
+            foreach (T item in source)
+            {
+                if (selector(item))
+                {
+                    return Optional<T>.Create(item);
+                }
+            }
+
+            return Optional.None<T>();
         }
 
         /// <summary>