Refactoring to use Utilities class for generic methods

Author: Razmo99

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

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Management.Automation.Language;
 using Microsoft.PowerShell.EditorServices.Handlers;
-using System.Linq;
 
 namespace Microsoft.PowerShell.EditorServices.Refactoring
 {
@@ -31,7 +30,8 @@ public IterativeFunctionRename(string OldName, string NewName, int StartLineNumb
             this.StartColumnNumber = StartColumnNumber;
             this.ScriptAst = ScriptAst;
 
-            Ast Node = Utilities.GetAstNodeByLineAndColumn(StartLineNumber, StartColumnNumber, ScriptAst, typeof(FunctionDefinitionAst), typeof(CommandAst));
+            Ast Node = Utilities.GetAstNodeByLineAndColumn(StartLineNumber, StartColumnNumber, ScriptAst,
+            typeof(FunctionDefinitionAst), typeof(CommandAst));
 
             if (Node != null)
             {
@@ -41,7 +41,7 @@ public IterativeFunctionRename(string OldName, string NewName, int StartLineNumb
                 }
                 if (Node is CommandAst commdef && commdef.GetCommandName().ToLower() == OldName.ToLower())
                 {
-                    TargetFunctionAst = GetFunctionDefByCommandAst(OldName, StartLineNumber, StartColumnNumber, ScriptAst);
+                    TargetFunctionAst = Utilities.GetFunctionDefByCommandAst(OldName, StartLineNumber, StartColumnNumber, ScriptAst);
                     if (TargetFunctionAst == null)
                     {
                         throw new FunctionDefinitionNotFoundException();

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

@@ -43,7 +43,7 @@ public IterativeVariableRename(string NewName, int StartLineNumber, int StartCol
                     isParam = true;
                     Ast parent = Node;
                     // Look for a target function that the parameterAst will be within if it exists
-                    parent = Utilities.LookForParentOfType(parent,typeof(FunctionDefinitionAst));
+                    parent = Utilities.LookForParentOfType(parent, typeof(FunctionDefinitionAst));
                     if (parent != null)
                     {
                         TargetFunction = (FunctionDefinitionAst)parent;
@@ -61,7 +61,7 @@ public static Ast GetVariableTopAssignment(int StartLineNumber, int StartColumnN
 
             // Look up the target object
             Ast node = Utilities.GetAstNodeByLineAndColumn(StartLineNumber, StartColumnNumber,
-            ScriptAst,typeof(VariableExpressionAst), typeof(CommandParameterAst), typeof(StringConstantExpressionAst));
+            ScriptAst, typeof(VariableExpressionAst), typeof(CommandParameterAst), typeof(StringConstantExpressionAst));
 
             string name = node switch
             {
@@ -77,7 +77,7 @@ public static Ast GetVariableTopAssignment(int StartLineNumber, int StartColumnN
             if (node is StringConstantExpressionAst)
             {
                 Ast parent = node;
-                parent = Utilities.LookForParentOfType(parent,typeof(AssignmentStatementAst));
+                parent = Utilities.LookForParentOfType(parent, typeof(AssignmentStatementAst));
                 if (parent is not null and AssignmentStatementAst assignmentStatementAst)
                 {
                     splatAssignment = (VariableExpressionAst)assignmentStatementAst.Left.Find(
@@ -181,7 +181,7 @@ internal static Ast GetAstParentScope(Ast node)
         {
             Ast parent = node;
             // Walk backwards up the tree looking for a ScriptBLock of a FunctionDefinition
-            parent = Utilities.LookForParentOfType(parent,typeof(ScriptBlockAst),typeof(FunctionDefinitionAst));
+            parent = Utilities.LookForParentOfType(parent, typeof(ScriptBlockAst), typeof(FunctionDefinitionAst));
             if (parent is ScriptBlockAst && parent.Parent != null && parent.Parent is FunctionDefinitionAst)
             {
                 parent = parent.Parent;