Fix FirstOrDefault bug

mobile46 · mobile46 · commit 4aeb86e3f7fa · 2023-11-01T10:43:52.000+03:00
diff --git a/src/StructLinq/First/StructCollection.First.cs b/src/StructLinq/First/StructCollection.First.cs
@@ -105,9 +105,12 @@ public static bool TryFirst<T, TCollection, TEnumerator>(this TCollection collec
                 return false;
             for (int i = 0; i < collection.Count; i++)
             {
-                first = collection.Get(i);
-                if (predicate(first))
+                var current = collection.Get(i);
+                if (predicate(current))
+                {
+                    first = current;
                     return true;
+                }
             }
             return false;
         }
@@ -120,9 +123,12 @@ public static bool TryFirst<T, TEnumerator>(this IStructCollection<T, TEnumerato
                 return false;
             for (int i = 0; i < collection.Count; i++)
             {
-                first = collection.Get(i);
-                if (predicate(first))
+                var current = collection.Get(i);
+                if (predicate(current))
+                {
+                    first = current;
                     return true;
+                }
             }
             return false;
         }
@@ -137,9 +143,12 @@ public static bool TryFirst<T, TCollection, TEnumerator, TFunc>(this TCollection
                 return false;
             for (int i = 0; i < collection.Count; i++)
             {
-                first = collection.Get(i);
+                var current = collection.Get(i);
                 if (predicate.Eval(first))
+                {
+                    first = current;
                     return true;
+                }
             }
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,12 @@ public static bool TryFirst<T, TCollection, TEnumerator>(this TCollection collec`
`105`	`105`	`return false;`
`106`	`106`	`for (int i = 0; i < collection.Count; i++)`
`107`	`107`	`{`
`108`		`- first = collection.Get(i);`
`109`		`- if (predicate(first))`
	`108`	`+ var current = collection.Get(i);`
	`109`	`+ if (predicate(current))`
	`110`	`+ {`
	`111`	`+ first = current;`
`110`	`112`	`return true;`
	`113`	`+ }`
`111`	`114`	`}`
`112`	`115`	`return false;`
`113`	`116`	`}`
`@@ -120,9 +123,12 @@ public static bool TryFirst<T, TEnumerator>(this IStructCollection<T, TEnumerato`
`120`	`123`	`return false;`
`121`	`124`	`for (int i = 0; i < collection.Count; i++)`
`122`	`125`	`{`
`123`		`- first = collection.Get(i);`
`124`		`- if (predicate(first))`
	`126`	`+ var current = collection.Get(i);`
	`127`	`+ if (predicate(current))`
	`128`	`+ {`
	`129`	`+ first = current;`
`125`	`130`	`return true;`
	`131`	`+ }`
`126`	`132`	`}`
`127`	`133`	`return false;`
`128`	`134`	`}`
`@@ -137,9 +143,12 @@ public static bool TryFirst<T, TCollection, TEnumerator, TFunc>(this TCollection`
`137`	`143`	`return false;`
`138`	`144`	`for (int i = 0; i < collection.Count; i++)`
`139`	`145`	`{`
`140`		`- first = collection.Get(i);`
	`146`	`+ var current = collection.Get(i);`
`141`	`147`	`if (predicate.Eval(first))`
	`148`	`+ {`
	`149`	`+ first = current;`
`142`	`150`	`return true;`
	`151`	`+ }`
`143`	`152`	`}`
`144`	`153`	`return false;`
`145`	`154`	`}`