Merge pull request #4791 from CommunityToolkit/revert-4333-feature/extended-tree-helpers

Revert "Feature/extended tree helpers"

Author: michael-hawker

Microsoft.Toolkit.Uwp.UI/Enums/SearchType.cs

@@ -63,7 +63,7 @@ public static partial class FrameworkElementExtensions
         /// </summary>
         /// <typeparam name="T">The type of elements to match.</typeparam>
         /// <param name="element">The root element.</param>
-        /// <param name="predicate">The predicate to use to match the child nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the child nodes.</param>
         /// <returns>The child that was found, or <see langword="null"/>.</returns>
         public static T? FindChild<T>(this FrameworkElement element, Func<T, bool> predicate)
             where T : notnull, FrameworkElement
@@ -80,7 +80,7 @@ public static partial class FrameworkElementExtensions
         /// <typeparam name="TState">The type of state to use when matching nodes.</typeparam>
         /// <param name="element">The root element.</param>
         /// <param name="state">The state to give as input to <paramref name="predicate"/>.</param>
-        /// <param name="predicate">The predicate to use to match the child nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the child nodes.</param>
         /// <returns>The child that was found, or <see langword="null"/>.</returns>
         public static T? FindChild<T, TState>(this FrameworkElement element, TState state, Func<T, TState, bool> predicate)
             where T : notnull, FrameworkElement
@@ -96,7 +96,7 @@ public static partial class FrameworkElementExtensions
         /// <typeparam name="T">The type of elements to match.</typeparam>
         /// <typeparam name="TPredicate">The type of predicate in use.</typeparam>
         /// <param name="element">The root element.</param>
-        /// <param name="predicate">The predicate to use to match the child nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the child nodes.</param>
         /// <returns>The child that was found, or <see langword="null"/>.</returns>
         private static T? FindChild<T, TPredicate>(this FrameworkElement element, ref TPredicate predicate)
             where T : notnull, FrameworkElement
@@ -296,7 +296,7 @@ public static partial class FrameworkElementExtensions
         /// </summary>
         /// <typeparam name="T">The type of elements to match.</typeparam>
         /// <param name="element">The root element.</param>
-        /// <param name="predicate">The predicate to use to match the child nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the child nodes.</param>
         /// <returns>The child (or self) that was found, or <see langword="null"/>.</returns>
         public static T? FindChildOrSelf<T>(this FrameworkElement element, Func<T, bool> predicate)
             where T : notnull, FrameworkElement
@@ -316,7 +316,7 @@ public static partial class FrameworkElementExtensions
         /// <typeparam name="TState">The type of state to use when matching nodes.</typeparam>
         /// <param name="element">The root element.</param>
         /// <param name="state">The state to give as input to <paramref name="predicate"/>.</param>
-        /// <param name="predicate">The predicate to use to match the child nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the child nodes.</param>
         /// <returns>The child (or self) that was found, or <see langword="null"/>.</returns>
         public static T? FindChildOrSelf<T, TState>(this FrameworkElement element, TState state, Func<T, TState, bool> predicate)
             where T : notnull, FrameworkElement
@@ -490,7 +490,7 @@ public static IEnumerable<FrameworkElement> FindChildren(this FrameworkElement e
         /// </summary>
         /// <typeparam name="T">The type of elements to match.</typeparam>
         /// <param name="element">The starting element.</param>
-        /// <param name="predicate">The predicate to use to match the parent nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the parent nodes.</param>
         /// <returns>The parent that was found, or <see langword="null"/>.</returns>
         public static T? FindParent<T>(this FrameworkElement element, Func<T, bool> predicate)
             where T : notnull, FrameworkElement
@@ -507,7 +507,7 @@ public static IEnumerable<FrameworkElement> FindChildren(this FrameworkElement e
         /// <typeparam name="TState">The type of state to use when matching nodes.</typeparam>
         /// <param name="element">The starting element.</param>
         /// <param name="state">The state to give as input to <paramref name="predicate"/>.</param>
-        /// <param name="predicate">The predicate to use to match the parent nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the parent nodes.</param>
         /// <returns>The parent that was found, or <see langword="null"/>.</returns>
         public static T? FindParent<T, TState>(this FrameworkElement element, TState state, Func<T, TState, bool> predicate)
             where T : notnull, FrameworkElement
@@ -523,7 +523,7 @@ public static IEnumerable<FrameworkElement> FindChildren(this FrameworkElement e
         /// <typeparam name="T">The type of elements to match.</typeparam>
         /// <typeparam name="TPredicate">The type of predicate in use.</typeparam>
         /// <param name="element">The starting element.</param>
-        /// <param name="predicate">The predicate to use to match the parent nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the parent nodes.</param>
         /// <returns>The parent that was found, or <see langword="null"/>.</returns>
         private static T? FindParent<T, TPredicate>(this FrameworkElement element, ref TPredicate predicate)
             where T : notnull, FrameworkElement
@@ -600,7 +600,7 @@ public static IEnumerable<FrameworkElement> FindChildren(this FrameworkElement e
         /// </summary>
         /// <typeparam name="T">The type of elements to match.</typeparam>
         /// <param name="element">The starting element.</param>
-        /// <param name="predicate">The predicate to use to match the parent nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the parent nodes.</param>
         /// <returns>The parent (or self) that was found, or <see langword="null"/>.</returns>
         public static T? FindParentOrSelf<T>(this FrameworkElement element, Func<T, bool> predicate)
             where T : notnull, FrameworkElement
@@ -620,7 +620,7 @@ public static IEnumerable<FrameworkElement> FindChildren(this FrameworkElement e
         /// <typeparam name="TState">The type of state to use when matching nodes.</typeparam>
         /// <param name="element">The starting element.</param>
         /// <param name="state">The state to give as input to <paramref name="predicate"/>.</param>
-        /// <param name="predicate">The predicate to use to match the parent nodes.</param>
+        /// <param name="predicate">The predicatee to use to match the parent nodes.</param>
         /// <returns>The parent (or self) that was found, or <see langword="null"/>.</returns>
         public static T? FindParentOrSelf<T, TState>(this FrameworkElement element, TState state, Func<T, TState, bool> predicate)
             where T : notnull, FrameworkElement

Microsoft.Toolkit.Uwp.UI/Extensions/DependencyObjectExtensions.cs

@@ -21,15 +21,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Predicates
         private readonly TState state;
 
         /// <summary>
-        /// The predicate to use to match items.
+        /// The predicatee to use to match items.
         /// </summary>
         private readonly Func<T, TState, bool> predicate;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PredicateByFunc{T, TState}"/> struct.
         /// </summary>
         /// <param name="state">The state to give as input to <paramref name="predicate"/>.</param>
-        /// <param name="predicate">The predicate to use to match items.</param>
+        /// <param name="predicate">The predicatee to use to match items.</param>
         public PredicateByFunc(TState state, Func<T, TState, bool> predicate)
         {
             this.state = state;

Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.LogicalTree.cs

@@ -15,14 +15,14 @@ namespace Microsoft.Toolkit.Uwp.UI.Predicates
         where T : class
     {
         /// <summary>
-        /// The predicate to use to match items.
+        /// The predicatee to use to match items.
         /// </summary>
         private readonly Func<T, bool> predicate;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PredicateByFunc{T}"/> struct.
         /// </summary>
-        /// <param name="predicate">The predicate to use to match items.</param>
+        /// <param name="predicate">The predicatee to use to match items.</param>
         public PredicateByFunc(Func<T, bool> predicate)
         {
             this.predicate = predicate;