CommandAst input was being sent to variable renamer not function renamer, proper error return's now when renaming commandAST thats not defined in the script file

Author: Razmo99

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

@@ -67,40 +67,60 @@ public async Task<PrepareRenameSymbolResult> Handle(PrepareRenameSymbolParams re
                     result.message = "Dot Source detected, this is currently not supported operation aborted";
                     return result;
                 }
+
+                bool IsFunction = false;
+                string tokenName = "";
+
                 switch (token)
                 {
-                    case FunctionDefinitionAst funcDef:
-                        {
-                            try
-                            {
 
-                                IterativeFunctionRename visitor = new(funcDef.Name,
-                                            request.RenameTo,
-                                            funcDef.Extent.StartLineNumber,
-                                            funcDef.Extent.StartColumnNumber,
-                                            scriptFile.ScriptAst);
-                            }
-                            catch (FunctionDefinitionNotFoundException)
-                            {
+                    case FunctionDefinitionAst FuncAst:
+                        IsFunction = true;
+                        tokenName = FuncAst.Name;
+                        break;
+                    case VariableExpressionAst or CommandParameterAst or ParameterAst:
+                        IsFunction = false;
+                        tokenName = request.RenameTo;
+                        break;
+                    case StringConstantExpressionAst:
 
-                                result.message = "Failed to Find function definition within current file";
-                            }
-
-                            break;
+                        if (token.Parent is CommandAst CommAst)
+                        {
+                            IsFunction = true;
+                            tokenName = CommAst.GetCommandName();
                         }
-
-                    case VariableExpressionAst or CommandAst or CommandParameterAst or ParameterAst or StringConstantExpressionAst:
+                        else
                         {
-                            IterativeVariableRename visitor = new(request.RenameTo,
-                                                token.Extent.StartLineNumber,
-                                                token.Extent.StartColumnNumber,
-                                                scriptFile.ScriptAst);
-                            if (visitor.TargetVariableAst == null)
-                            {
-                                result.message = "Failed to find variable definition within the current file";
-                            }
-                            break;
+                            IsFunction = false;
                         }
+                        break;
+                }
+
+                if (IsFunction)
+                {
+                    try
+                    {
+                        IterativeFunctionRename visitor = new(tokenName,
+                            request.RenameTo,
+                            token.Extent.StartLineNumber,
+                            token.Extent.StartColumnNumber,
+                            scriptFile.ScriptAst);
+                    }
+                    catch (FunctionDefinitionNotFoundException)
+                    {
+                        result.message = "Failed to Find function definition within current file";
+                    }
+                }
+                else
+                {
+                    IterativeVariableRename visitor = new(tokenName,
+                                        token.Extent.StartLineNumber,
+                                        token.Extent.StartColumnNumber,
+                                        scriptFile.ScriptAst);
+                    if (visitor.TargetVariableAst == null)
+                    {
+                        result.message = "Failed to find variable definition within the current file";
+                    }
                 }
                 return result;
             }).ConfigureAwait(false);

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

@@ -73,22 +73,28 @@ public RenameSymbolHandler(ILoggerFactory loggerFactory, WorkspaceService worksp
         }
         internal static ModifiedFileResponse RenameFunction(Ast token, Ast scriptAst, RenameSymbolParams request)
         {
+            string tokenName = "";
             if (token is FunctionDefinitionAst funcDef)
             {
-                IterativeFunctionRename visitor = new(funcDef.Name,
-                            request.RenameTo,
-                            funcDef.Extent.StartLineNumber,
-                            funcDef.Extent.StartColumnNumber,
-                            scriptAst);
-                visitor.Visit(scriptAst);
-                ModifiedFileResponse FileModifications = new(request.FileName)
-                {
-                    Changes = visitor.Modifications
-                };
-                return FileModifications;
-
+                tokenName = funcDef.Name;
             }
-            return null;
+            else if (token.Parent is CommandAst CommAst)
+            {
+                tokenName = CommAst.GetCommandName();
+            }
+            IterativeFunctionRename visitor = new(tokenName,
+                        request.RenameTo,
+                        token.Extent.StartLineNumber,
+                        token.Extent.StartColumnNumber,
+                        scriptAst);
+            visitor.Visit(scriptAst);
+            ModifiedFileResponse FileModifications = new(request.FileName)
+            {
+                Changes = visitor.Modifications
+            };
+            return FileModifications;
+
+
 
         }
         internal static ModifiedFileResponse RenameVariable(Ast symbol, Ast scriptAst, RenameSymbolParams request)
@@ -121,11 +127,11 @@ public async Task<RenameSymbolResult> Handle(RenameSymbolParams request, Cancell
             return await Task.Run(() =>
             {
 
-                Ast token = Utilities.GetAst(request.Line + 1,request.Column + 1,scriptFile.ScriptAst);
+                Ast token = Utilities.GetAst(request.Line + 1, request.Column + 1, scriptFile.ScriptAst);
 
                 if (token == null) { return null; }
 
-                ModifiedFileResponse FileModifications = token is FunctionDefinitionAst
+                ModifiedFileResponse FileModifications = (token is FunctionDefinitionAst || token.Parent is CommandAst)
                     ? RenameFunction(token, scriptFile.ScriptAst, request)
                     : RenameVariable(token, scriptFile.ScriptAst, request);