extracted method of LookForParentOfType from GetFuncDecFromCommAst

Author: Razmo99

src/PowerShellEditorServices/Services/PowerShell/Refactoring/IterativeFunctionVistor.cs

@@ -31,7 +31,7 @@ public IterativeFunctionRename(string OldName, string NewName, int StartLineNumb
             this.StartColumnNumber = StartColumnNumber;
             this.ScriptAst = ScriptAst;
 
-            Ast Node = FunctionRename.GetAstNodeByLineAndColumn(OldName, StartLineNumber, StartColumnNumber, ScriptAst);
+            Ast Node = GetAstNodeByLineAndColumn(OldName, StartLineNumber, StartColumnNumber, ScriptAst);
             if (Node != null)
             {
                 if (Node is FunctionDefinitionAst FuncDef)
@@ -218,7 +218,6 @@ ast is CommandAst CommDef &&
                     CommDef.GetCommandName().ToLower() == OldName.ToLower();
                 }, true);
             }
-
             return result;
         }
 
@@ -248,12 +247,7 @@ public static FunctionDefinitionAst GetFunctionDefByCommandAst(string OldName, i
             {
                 return FunctionDefinitions[0];
             }
-            // Sort function definitions
-            //FunctionDefinitions.Sort((a, b) =>
-            //{
-            //    return b.Extent.EndColumnNumber + b.Extent.EndLineNumber -
-            //       a.Extent.EndLineNumber + a.Extent.EndColumnNumber;
-            //});
+
             // Determine which function definition is the right one
             FunctionDefinitionAst CorrectDefinition = null;
             for (int i = FunctionDefinitions.Count - 1; i >= 0; i--)
@@ -262,14 +256,8 @@ public static FunctionDefinitionAst GetFunctionDefByCommandAst(string OldName, i
 
                 Ast parent = element.Parent;
                 // walk backwards till we hit a functiondefinition if any
-                while (null != parent)
-                {
-                    if (parent is FunctionDefinitionAst)
-                    {
-                        break;
-                    }
-                    parent = parent.Parent;
-                }
+                parent = Utilities.LookForParentOfType<FunctionDefinitionAst>(parent);
+
                 // we have hit the global scope of the script file
                 if (null == parent)
                 {

src/PowerShellEditorServices/Services/PowerShell/Refactoring/Utilities.cs

@@ -9,6 +9,22 @@ namespace Microsoft.PowerShell.EditorServices.Refactoring
 {
     internal class Utilities
     {
+
+        public static Ast LookForParentOfType<T>(Ast ast)
+        {
+            Ast parent = ast.Parent;
+            // walk backwards till we hit a parent of the specified type or return null
+            while (null != parent)
+            {
+                if (typeof(T) == parent.GetType())
+                {
+                    return parent;
+                }
+                parent = parent.Parent;
+            }
+            return null;
+
+        }
         public static Ast GetAst(int StartLineNumber, int StartColumnNumber, Ast Ast)
         {
             Ast token = null;