updated visitors to use generic GetAstNodeByLineAndColumn

Author: Razmo99

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

@@ -31,14 +31,15 @@ public IterativeFunctionRename(string OldName, string NewName, int StartLineNumb
             this.StartColumnNumber = StartColumnNumber;
             this.ScriptAst = ScriptAst;
 
-            Ast Node = GetAstNodeByLineAndColumn(OldName, StartLineNumber, StartColumnNumber, ScriptAst);
+            Ast Node = Utilities.GetAstNodeByLineAndColumn(StartLineNumber, StartColumnNumber, ScriptAst, typeof(FunctionDefinitionAst), typeof(CommandAst));
+
             if (Node != null)
             {
-                if (Node is FunctionDefinitionAst FuncDef)
+                if (Node is FunctionDefinitionAst FuncDef && FuncDef.Name.ToLower() == OldName.ToLower())
                 {
                     TargetFunctionAst = FuncDef;
                 }
-                if (Node is CommandAst)
+                if (Node is CommandAst commdef && commdef.GetCommandName().ToLower() == OldName.ToLower())
                 {
                     TargetFunctionAst = GetFunctionDefByCommandAst(OldName, StartLineNumber, StartColumnNumber, ScriptAst);
                     if (TargetFunctionAst == null)
@@ -196,31 +197,6 @@ public void ProcessNode(Ast node, bool shouldRename)
             Log.Add($"ShouldRename after proc: {shouldRename}");
         }
 
-        public static Ast GetAstNodeByLineAndColumn(string OldName, int StartLineNumber, int StartColumnNumber, Ast ScriptFile)
-        {
-            Ast result = null;
-            // Looking for a function
-            result = ScriptFile.Find(ast =>
-            {
-                return ast.Extent.StartLineNumber == StartLineNumber &&
-                ast.Extent.StartColumnNumber == StartColumnNumber &&
-                ast is FunctionDefinitionAst FuncDef &&
-                FuncDef.Name.ToLower() == OldName.ToLower();
-            }, true);
-            // Looking for a a Command call
-            if (null == result)
-            {
-                result = ScriptFile.Find(ast =>
-                {
-                    return ast.Extent.StartLineNumber == StartLineNumber &&
-                    ast.Extent.StartColumnNumber == StartColumnNumber &&
-                    ast is CommandAst CommDef &&
-                    CommDef.GetCommandName().ToLower() == OldName.ToLower();
-                }, true);
-            }
-            return result;
-        }
-
         public static FunctionDefinitionAst GetFunctionDefByCommandAst(string OldName, int StartLineNumber, int StartColumnNumber, Ast ScriptFile)
         {
             // Look up the targetted object

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

@@ -56,27 +56,12 @@ public IterativeVariableRename(string NewName, int StartLineNumber, int StartCol
             }
         }
 
-        public static Ast GetAstNodeByLineAndColumn(int StartLineNumber, int StartColumnNumber, Ast ScriptAst)
-        {
-            Ast result = null;
-            result = ScriptAst.Find(ast =>
-            {
-                return ast.Extent.StartLineNumber == StartLineNumber &&
-                ast.Extent.StartColumnNumber == StartColumnNumber &&
-                ast is VariableExpressionAst or CommandParameterAst or StringConstantExpressionAst;
-            }, true);
-            if (result == null)
-            {
-                throw new TargetSymbolNotFoundException();
-            }
-            return result;
-        }
-
         public static Ast GetVariableTopAssignment(int StartLineNumber, int StartColumnNumber, Ast ScriptAst)
         {
 
             // Look up the target object
-            Ast node = GetAstNodeByLineAndColumn(StartLineNumber, StartColumnNumber, ScriptAst);
+            Ast node = Utilities.GetAstNodeByLineAndColumn(StartLineNumber, StartColumnNumber,
+            ScriptAst,typeof(VariableExpressionAst), typeof(CommandParameterAst), typeof(StringConstantExpressionAst));
 
             string name = node switch
             {