reverting changes from bad merge request pull

Author: Razmo99

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.IsType<VariableExpressionAst>(symbol);
-            Assert.Equal(15, symbol.Extent.StartLineNumber);
-            Assert.Equal(1, symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
+            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.IsType<VariableExpressionAst>(symbol);
-            Assert.Equal(15, symbol.Extent.StartLineNumber);
-            Assert.Equal(1, symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
+            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.IsType<VariableExpressionAst>(symbol);
-            Assert.Equal(3, symbol.Extent.StartLineNumber);
-            Assert.Equal(17, symbol.Extent.StartColumnNumber);
+            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
+            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);
-            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);
+
+            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"
+            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"
             };
             ScriptFile scriptFile = GetTestScript(request.FileName);
 
-            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);
+            Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
+            Assert.Equal(1,symbol.Extent.StartLineNumber);
+            Assert.Equal(1,symbol.Extent.StartColumnNumber);
 
         }
     }