Merge branch 'rename-function-customvisitor' of https://github.com/Razmo99/PowerShellEditorServices into rename-function-customvisitor

Author: Razmo99

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

@@ -108,14 +108,24 @@ public static FunctionDefinitionAst GetFunctionDefByCommandAst(string OldName, i
 
         public static Ast GetAst(int StartLineNumber, int StartColumnNumber, Ast Ast)
         {
-            Ast token = null;
 
-            token = Ast.Find(ast =>
+            // Get all the tokens on the startline so we can look for an appropriate Ast to return
+            IEnumerable<Ast> tokens = Ast.FindAll(ast =>
             {
-                return StartLineNumber == ast.Extent.StartLineNumber &&
-                ast.Extent.EndColumnNumber >= StartColumnNumber &&
-                    StartColumnNumber >= ast.Extent.StartColumnNumber;
+                return StartLineNumber == ast.Extent.StartLineNumber;
             }, true);
+            // Check if the Ast is a FunctionDefinitionAst
+            IEnumerable<FunctionDefinitionAst> Functions = tokens.OfType<FunctionDefinitionAst>();
+            if (Functions.Any())
+            {
+                foreach (FunctionDefinitionAst Function in Functions)
+                {
+                    if (Function.Extent.StartLineNumber != Function.Extent.EndLineNumber)
+                    {
+                        return Function;
+                    }
+                }
+            }
 
             if (token is NamedBlockAst)
             {
@@ -134,14 +144,20 @@ public static Ast GetAst(int StartLineNumber, int StartColumnNumber, Ast Ast)
 
             IEnumerable<Ast> tokens = token.FindAll(ast =>
             {
-                return ast.Extent.EndColumnNumber >= StartColumnNumber
-                && StartColumnNumber >= ast.Extent.StartColumnNumber;
+                return ast.Extent.StartLineNumber == StartLineNumber &&
+                ast.Extent.StartColumnNumber <= StartColumnNumber &&
+                ast.Extent.EndColumnNumber >= StartColumnNumber;
             }, true);
-            if (tokens.Count() > 1)
+            if (token != null)
             {
-                token = tokens.LastOrDefault();
+                if (token.First() is AssignmentStatementAst Assignment)
+                {
+                    return Assignment.Left;
+                }
+                return token.Last();
             }
-            return token;
+
+            return token.First();
         }
     }
 }

test/PowerShellEditorServices.Test/Refactoring/RefactorUtilitiesTests.cs

@@ -40,113 +40,113 @@ public void Dispose()
         [Fact]
         public void GetVariableExpressionAst()
         {
-            RenameSymbolParams request = new(){
-                Column=11,
-                Line=15,
-                RenameTo="Renamed",
-                FileName="TestDetection.ps1"
+            RenameSymbolParams request = new()
+            {
+                Column = 11,
+                Line = 15,
+                RenameTo = "Renamed",
+                FileName = "TestDetection.ps1"
             };
             ScriptFile scriptFile = GetTestScript(request.FileName);
 
-            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
-            Assert.Equal(15,symbol.Extent.StartLineNumber);
-            Assert.Equal(1,symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
+            Assert.IsType<VariableExpressionAst>(symbol);
+            Assert.Equal(15, symbol.Extent.StartLineNumber);
+            Assert.Equal(1, symbol.Extent.StartColumnNumber);
 
         }
         [Fact]
         public void GetVariableExpressionStartAst()
         {
-            RenameSymbolParams request = new(){
-                Column=1,
-                Line=15,
-                RenameTo="Renamed",
-                FileName="TestDetection.ps1"
+            RenameSymbolParams request = new()
+            {
+                Column = 1,
+                Line = 15,
+                RenameTo = "Renamed",
+                FileName = "TestDetection.ps1"
             };
             ScriptFile scriptFile = GetTestScript(request.FileName);
 
-            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
-            Assert.Equal(15,symbol.Extent.StartLineNumber);
-            Assert.Equal(1,symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
+            Assert.IsType<VariableExpressionAst>(symbol);
+            Assert.Equal(15, symbol.Extent.StartLineNumber);
+            Assert.Equal(1, symbol.Extent.StartColumnNumber);
 
         }
         [Fact]
         public void GetVariableWithinParameterAst()
         {
-            RenameSymbolParams request = new(){
-                Column=21,
-                Line=3,
-                RenameTo="Renamed",
-                FileName="TestDetection.ps1"
+            RenameSymbolParams request = new()
+            {
+                Column = 21,
+                Line = 3,
+                RenameTo = "Renamed",
+                FileName = "TestDetection.ps1"
             };
             ScriptFile scriptFile = GetTestScript(request.FileName);
 
-            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
-            Assert.Equal(3,symbol.Extent.StartLineNumber);
-            Assert.Equal(17,symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
+            Assert.IsType<VariableExpressionAst>(symbol);
+            Assert.Equal(3, symbol.Extent.StartLineNumber);
+            Assert.Equal(17, symbol.Extent.StartColumnNumber);
 
         }
         [Fact]
         public void GetHashTableKey()
         {
-            RenameSymbolParams request = new(){
-                Column=9,
-                Line=16,
-                RenameTo="Renamed",
-                FileName="TestDetection.ps1"
+            RenameSymbolParams request = new()
+            {
+                Column = 9,
+                Line = 16,
+                RenameTo = "Renamed",
+                FileName = "TestDetection.ps1"
             };
             ScriptFile scriptFile = GetTestScript(request.FileName);
-
-            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
-            Assert.Equal(16,symbol.Extent.StartLineNumber);
-            Assert.Equal(5,symbol.Extent.StartColumnNumber);
+            List<Token> Tokens = scriptFile.ScriptTokens.Cast<Token>().ToList();
+            IEnumerable<Token> Found = Tokens.FindAll(e =>
+            {
+                return e.Extent.StartLineNumber == request.Line &&
+                e.Extent.StartColumnNumber <= request.Column &&
+                e.Extent.EndColumnNumber >= request.Column;
+            });
+            Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
+            Assert.Equal(16, symbol.Extent.StartLineNumber);
+            Assert.Equal(5, symbol.Extent.StartColumnNumber);
 
         }
         [Fact]
         public void GetVariableWithinCommandAst()
         {
-            RenameSymbolParams request = new(){
-                Column=29,
-                Line=6,
-                RenameTo="Renamed",
-                FileName="TestDetection.ps1"
+            RenameSymbolParams request = new()
+            {
+                Column = 29,
+                Line = 6,
+                RenameTo = "Renamed",
+                FileName = "TestDetection.ps1"
             };
             ScriptFile scriptFile = GetTestScript(request.FileName);
 
-            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
-            Assert.Equal(6,symbol.Extent.StartLineNumber);
-            Assert.Equal(28,symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
+            Assert.Equal(6, symbol.Extent.StartLineNumber);
+            Assert.Equal(28, symbol.Extent.StartColumnNumber);
 
         }
         [Fact]
         public void GetCommandParameterAst()
         {
-            RenameSymbolParams request = new(){
-                Column=12,
-                Line=21,
-                RenameTo="Renamed",
-                FileName="TestDetection.ps1"
-            };
-            ScriptFile scriptFile = GetTestScript(request.FileName);
-
-            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
-            Assert.Equal(21,symbol.Extent.StartLineNumber);
-            Assert.Equal(10,symbol.Extent.StartColumnNumber);
-
-        }
-        [Fact]
-        public void GetFunctionDefinitionAst()
-        {
-            RenameSymbolParams request = new(){
-                Column=12,
-                Line=1,
-                RenameTo="Renamed",
-                FileName="TestDetection.ps1"
+            RenameSymbolParams request = new()
+            {
+                Column = 12,
+                Line = 21,
+                RenameTo = "Renamed",
+                FileName = "TestDetection.ps1"
             };
             ScriptFile scriptFile = GetTestScript(request.FileName);
 
-            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
-            Assert.Equal(1,symbol.Extent.StartLineNumber);
-            Assert.Equal(1,symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
+            Assert.IsType<CommandParameterAst>(symbol);
+            Assert.Equal(21, symbol.Extent.StartLineNumber);
+            Assert.Equal(10, symbol.Extent.StartColumnNumber);
 
         }
     }