adjusted rename to use utilities

Author: Razmo99

src/PowerShellEditorServices/Services/PowerShell/Handlers/PrepareRenameSymbol.cs

@@ -10,8 +10,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Refactoring;
-using System.Collections.Generic;
-using System.Linq;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
@@ -55,16 +54,9 @@ public async Task<PrepareRenameSymbolResult> Handle(PrepareRenameSymbolParams re
                     message = ""
                 };
                 // ast is FunctionDefinitionAst or CommandAst or VariableExpressionAst or StringConstantExpressionAst &&
-                Ast token = scriptFile.ScriptAst.Find(ast =>
-                {
-                    return request.Line + 1 == ast.Extent.StartLineNumber &&
-                           request.Column + 1 >= ast.Extent.StartColumnNumber;
-                }, true);
-                IEnumerable<Ast> tokens = token.FindAll(ast =>{
-                    return ast.Extent.StartColumnNumber <= request.Column &&
-                    ast.Extent.EndColumnNumber >= request.Column;
-                },true);
-                token = tokens.LastOrDefault();
+                SymbolReference symbol = scriptFile.References.TryGetSymbolAtPosition(request.Line + 1, request.Column + 1);
+                Ast token = Utilities.GetAst(request.Line + 1,request.Column + 1,scriptFile.ScriptAst);
+
                 if (token == null)
                 {
                     result.message = "Unable to find symbol";
@@ -93,7 +85,7 @@ public async Task<PrepareRenameSymbolResult> Handle(PrepareRenameSymbolParams re
                             break;
                         }
 
-                    case VariableExpressionAst or CommandAst:
+                    case VariableExpressionAst or CommandAst or CommandParameterAst or ParameterAst or StringConstantExpressionAst:
                         {
 
                             try

src/PowerShellEditorServices/Services/PowerShell/Handlers/RenameSymbol.cs

@@ -11,7 +11,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Refactoring;
-using System.Linq;
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/renameSymbol")]
@@ -94,7 +93,7 @@ internal static ModifiedFileResponse RenameFunction(Ast token, Ast scriptAst, Re
         }
         internal static ModifiedFileResponse RenameVariable(Ast symbol, Ast scriptAst, RenameSymbolParams request)
         {
-            if (symbol is VariableExpressionAst or ParameterAst)
+            if (symbol is VariableExpressionAst or ParameterAst or CommandParameterAst or StringConstantExpressionAst)
             {
                 IterativeVariableRename visitor = new(request.RenameTo,
                                             symbol.Extent.StartLineNumber,
@@ -122,16 +121,7 @@ public async Task<RenameSymbolResult> Handle(RenameSymbolParams request, Cancell
             return await Task.Run(() =>
             {
 
-                Ast token = scriptFile.ScriptAst.Find(ast =>
-                {
-                    return request.Line + 1 == ast.Extent.StartLineNumber &&
-                           request.Column + 1 >= ast.Extent.StartColumnNumber;
-                }, true);
-                IEnumerable<Ast> tokens = token.FindAll(ast =>{
-                    return ast.Extent.StartColumnNumber <= request.Column &&
-                    ast.Extent.EndColumnNumber >= request.Column;
-                },true);
-                token = tokens.LastOrDefault();
+                Ast token = Utilities.GetAst(request.Line + 1,request.Column + 1,scriptFile.ScriptAst);
 
                 if (token == null) { return null; }