Skip to content

Commit e5cc303

Browse files
Razmo99JustinGrote
authored andcommitted
reverting changes from bad merge request pull
1 parent 25bb53a commit e5cc303

File tree

1 file changed

+65
-65
lines changed

1 file changed

+65
-65
lines changed

test/PowerShellEditorServices.Test/Refactoring/RefactorUtilitiesTests.cs

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -43,113 +43,113 @@ public void Dispose()
4343
[Fact]
4444
public void GetVariableExpressionAst()
4545
{
46-
RenameSymbolParams request = new()
47-
{
48-
Column = 11,
49-
Line = 15,
50-
RenameTo = "Renamed",
51-
FileName = "TestDetection.ps1"
46+
RenameSymbolParams request = new(){
47+
Column=11,
48+
Line=15,
49+
RenameTo="Renamed",
50+
FileName="TestDetection.ps1"
5251
};
5352
ScriptFile scriptFile = GetTestScript(request.FileName);
5453

55-
Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
56-
Assert.IsType<VariableExpressionAst>(symbol);
57-
Assert.Equal(15, symbol.Extent.StartLineNumber);
58-
Assert.Equal(1, symbol.Extent.StartColumnNumber);
54+
Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
55+
Assert.Equal(15,symbol.Extent.StartLineNumber);
56+
Assert.Equal(1,symbol.Extent.StartColumnNumber);
5957

6058
}
6159
[Fact]
6260
public void GetVariableExpressionStartAst()
6361
{
64-
RenameSymbolParams request = new()
65-
{
66-
Column = 1,
67-
Line = 15,
68-
RenameTo = "Renamed",
69-
FileName = "TestDetection.ps1"
62+
RenameSymbolParams request = new(){
63+
Column=1,
64+
Line=15,
65+
RenameTo="Renamed",
66+
FileName="TestDetection.ps1"
7067
};
7168
ScriptFile scriptFile = GetTestScript(request.FileName);
7269

73-
Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
74-
Assert.IsType<VariableExpressionAst>(symbol);
75-
Assert.Equal(15, symbol.Extent.StartLineNumber);
76-
Assert.Equal(1, symbol.Extent.StartColumnNumber);
70+
Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
71+
Assert.Equal(15,symbol.Extent.StartLineNumber);
72+
Assert.Equal(1,symbol.Extent.StartColumnNumber);
7773

7874
}
7975
[Fact]
8076
public void GetVariableWithinParameterAst()
8177
{
82-
RenameSymbolParams request = new()
83-
{
84-
Column = 21,
85-
Line = 3,
86-
RenameTo = "Renamed",
87-
FileName = "TestDetection.ps1"
78+
RenameSymbolParams request = new(){
79+
Column=21,
80+
Line=3,
81+
RenameTo="Renamed",
82+
FileName="TestDetection.ps1"
8883
};
8984
ScriptFile scriptFile = GetTestScript(request.FileName);
9085

91-
Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
92-
Assert.IsType<VariableExpressionAst>(symbol);
93-
Assert.Equal(3, symbol.Extent.StartLineNumber);
94-
Assert.Equal(17, symbol.Extent.StartColumnNumber);
86+
Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
87+
Assert.Equal(3,symbol.Extent.StartLineNumber);
88+
Assert.Equal(17,symbol.Extent.StartColumnNumber);
9589

9690
}
9791
[Fact]
9892
public void GetHashTableKey()
9993
{
100-
RenameSymbolParams request = new()
101-
{
102-
Column = 9,
103-
Line = 16,
104-
RenameTo = "Renamed",
105-
FileName = "TestDetection.ps1"
94+
RenameSymbolParams request = new(){
95+
Column=9,
96+
Line=16,
97+
RenameTo="Renamed",
98+
FileName="TestDetection.ps1"
10699
};
107100
ScriptFile scriptFile = GetTestScript(request.FileName);
108-
List<Token> Tokens = scriptFile.ScriptTokens.Cast<Token>().ToList();
109-
IEnumerable<Token> Found = Tokens.FindAll(e =>
110-
{
111-
return e.Extent.StartLineNumber == request.Line &&
112-
e.Extent.StartColumnNumber <= request.Column &&
113-
e.Extent.EndColumnNumber >= request.Column;
114-
});
115-
Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
116-
Assert.Equal(16, symbol.Extent.StartLineNumber);
117-
Assert.Equal(5, symbol.Extent.StartColumnNumber);
101+
102+
Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
103+
Assert.Equal(16,symbol.Extent.StartLineNumber);
104+
Assert.Equal(5,symbol.Extent.StartColumnNumber);
118105

119106
}
120107
[Fact]
121108
public void GetVariableWithinCommandAst()
122109
{
123-
RenameSymbolParams request = new()
124-
{
125-
Column = 29,
126-
Line = 6,
127-
RenameTo = "Renamed",
128-
FileName = "TestDetection.ps1"
110+
RenameSymbolParams request = new(){
111+
Column=29,
112+
Line=6,
113+
RenameTo="Renamed",
114+
FileName="TestDetection.ps1"
129115
};
130116
ScriptFile scriptFile = GetTestScript(request.FileName);
131117

132-
Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
133-
Assert.Equal(6, symbol.Extent.StartLineNumber);
134-
Assert.Equal(28, symbol.Extent.StartColumnNumber);
118+
Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
119+
Assert.Equal(6,symbol.Extent.StartLineNumber);
120+
Assert.Equal(28,symbol.Extent.StartColumnNumber);
135121

136122
}
137123
[Fact]
138124
public void GetCommandParameterAst()
139125
{
140-
RenameSymbolParams request = new()
141-
{
142-
Column = 12,
143-
Line = 21,
144-
RenameTo = "Renamed",
145-
FileName = "TestDetection.ps1"
126+
RenameSymbolParams request = new(){
127+
Column=12,
128+
Line=21,
129+
RenameTo="Renamed",
130+
FileName="TestDetection.ps1"
146131
};
147132
ScriptFile scriptFile = GetTestScript(request.FileName);
148133

149-
Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst);
150-
Assert.IsType<CommandParameterAst>(symbol);
151-
Assert.Equal(21, symbol.Extent.StartLineNumber);
152-
Assert.Equal(10, symbol.Extent.StartColumnNumber);
134+
Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
135+
Assert.Equal(21,symbol.Extent.StartLineNumber);
136+
Assert.Equal(10,symbol.Extent.StartColumnNumber);
137+
138+
}
139+
[Fact]
140+
public void GetFunctionDefinitionAst()
141+
{
142+
RenameSymbolParams request = new(){
143+
Column=12,
144+
Line=1,
145+
RenameTo="Renamed",
146+
FileName="TestDetection.ps1"
147+
};
148+
ScriptFile scriptFile = GetTestScript(request.FileName);
149+
150+
Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst);
151+
Assert.Equal(1,symbol.Extent.StartLineNumber);
152+
Assert.Equal(1,symbol.Extent.StartColumnNumber);
153153

154154
}
155155
[Fact]

0 commit comments

Comments
 (0)