Fixing an odd edge case, of not being to rename a variable directly under a function definition, but selecting one column to the right worked

Author: Razmo99

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

@@ -100,10 +100,12 @@ public static FunctionDefinitionAst GetFunctionDefByCommandAst(string OldName, i
             return CorrectDefinition;
         }
 
-        public static bool AssertContainsDotSourced(Ast ScriptAst){
-            Ast dotsourced = ScriptAst.Find(ast =>{
+        public static bool AssertContainsDotSourced(Ast ScriptAst)
+        {
+            Ast dotsourced = ScriptAst.Find(ast =>
+            {
                 return ast is CommandAst commandAst && commandAst.InvocationOperator == TokenKind.Dot;
-            },true);
+            }, true);
             if (dotsourced != null)
             {
                 return true;
@@ -121,8 +123,36 @@ public static Ast GetAst(int StartLineNumber, int StartColumnNumber, Ast Ast)
                     StartColumnNumber >= ast.Extent.StartColumnNumber;
             }, true);
 
-            IEnumerable<Ast> token = null;
-            token = Ast.FindAll(ast =>
+            if (token is NamedBlockAst)
+            {
+                // NamedBlockAST starts on the same line as potentially another AST,
+                // its likley a user is not after the NamedBlockAst but what it contains
+                IEnumerable<Ast> stacked_tokens = token.FindAll(ast =>
+                {
+                    return StartLineNumber == ast.Extent.StartLineNumber &&
+                    ast.Extent.EndColumnNumber >= StartColumnNumber
+                    && StartColumnNumber >= ast.Extent.StartColumnNumber;
+                }, true);
+
+                if (stacked_tokens.Count() > 1)
+                {
+                    return stacked_tokens.LastOrDefault();
+                }
+
+                return token.Parent;
+            }
+
+            if (null == token)
+            {
+                IEnumerable<Ast> LineT = Ast.FindAll(ast =>
+                {
+                    return StartLineNumber == ast.Extent.StartLineNumber &&
+                    StartColumnNumber >= ast.Extent.StartColumnNumber;
+                }, true);
+                return LineT.OfType<FunctionDefinitionAst>()?.LastOrDefault();
+            }
+
+            IEnumerable<Ast> tokens = token.FindAll(ast =>
             {
                 return ast.Extent.EndColumnNumber >= StartColumnNumber
                 && StartColumnNumber >= ast.Extent.StartColumnNumber;

test/PowerShellEditorServices.Test.Shared/Refactoring/Utilities/TestDetectionUnderFunctionDef.ps1

@@ -0,0 +1,15 @@
+function Write-Item($itemCount) {
+    $i = 1
+
+    while ($i -le $itemCount) {
+        $str = "Output $i"
+        Write-Output $str
+
+        # In the gutter on the left, right click and select "Add Conditional Breakpoint"
+        # on the next line. Use the condition: $i -eq 25
+        $i = $i + 1
+
+        # Slow down execution a bit so user can test the "Pause debugger" feature.
+        Start-Sleep -Milliseconds $DelayMilliseconds
+    }
+}

test/PowerShellEditorServices.Test/Refactoring/RefactorUtilitiesTests.cs

@@ -152,6 +152,23 @@ public void GetFunctionDefinitionAst()
             Assert.Equal(1, symbol.Extent.StartLineNumber);
             Assert.Equal(1, symbol.Extent.StartColumnNumber);
 
+        }
+        [Fact]
+        public void GetVariableUnderFunctionDef()
+        {
+            RenameSymbolParams request = new(){
+                Column=5,
+                Line=2,
+                RenameTo="Renamed",
+                FileName="TestDetectionUnderFunctionDef.ps1"
+            };
+            ScriptFile scriptFile = GetTestScript(request.FileName);
+
+            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
+            Assert.IsType<VariableExpressionAst>(symbol);
+            Assert.Equal(2,symbol.Extent.StartLineNumber);
+            Assert.Equal(5,symbol.Extent.StartColumnNumber);
+
         }
         [Fact]
         public void AssertContainsDotSourcingTrue()