|
13 | 13 | using Xunit;
|
14 | 14 | using System.Management.Automation.Language;
|
15 | 15 | using Microsoft.PowerShell.EditorServices.Refactoring;
|
| 16 | +using System.Management.Automation.Language; |
| 17 | +using System.Collections.Generic; |
| 18 | +using System.Linq; |
16 | 19 |
|
17 | 20 | namespace PowerShellEditorServices.Test.Refactoring
|
18 | 21 | {
|
@@ -40,114 +43,131 @@ public void Dispose()
|
40 | 43 | [Fact]
|
41 | 44 | public void GetVariableExpressionAst()
|
42 | 45 | {
|
43 |
| - RenameSymbolParams request = new(){ |
44 |
| - Column=11, |
45 |
| - Line=15, |
46 |
| - RenameTo="Renamed", |
47 |
| - FileName="TestDetection.ps1" |
| 46 | + RenameSymbolParams request = new() |
| 47 | + { |
| 48 | + Column = 11, |
| 49 | + Line = 15, |
| 50 | + RenameTo = "Renamed", |
| 51 | + FileName = "TestDetection.ps1" |
48 | 52 | };
|
49 | 53 | ScriptFile scriptFile = GetTestScript(request.FileName);
|
50 | 54 |
|
51 |
| - Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst); |
52 |
| - Assert.Equal(15,symbol.Extent.StartLineNumber); |
53 |
| - Assert.Equal(1,symbol.Extent.StartColumnNumber); |
| 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 | 59 |
|
55 | 60 | }
|
56 | 61 | [Fact]
|
57 | 62 | public void GetVariableExpressionStartAst()
|
58 | 63 | {
|
59 |
| - RenameSymbolParams request = new(){ |
60 |
| - Column=1, |
61 |
| - Line=15, |
62 |
| - RenameTo="Renamed", |
63 |
| - FileName="TestDetection.ps1" |
| 64 | + RenameSymbolParams request = new() |
| 65 | + { |
| 66 | + Column = 1, |
| 67 | + Line = 15, |
| 68 | + RenameTo = "Renamed", |
| 69 | + FileName = "TestDetection.ps1" |
64 | 70 | };
|
65 | 71 | ScriptFile scriptFile = GetTestScript(request.FileName);
|
66 | 72 |
|
67 |
| - Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst); |
68 |
| - Assert.Equal(15,symbol.Extent.StartLineNumber); |
69 |
| - Assert.Equal(1,symbol.Extent.StartColumnNumber); |
| 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 | 77 |
|
71 | 78 | }
|
72 | 79 | [Fact]
|
73 | 80 | public void GetVariableWithinParameterAst()
|
74 | 81 | {
|
75 |
| - RenameSymbolParams request = new(){ |
76 |
| - Column=21, |
77 |
| - Line=3, |
78 |
| - RenameTo="Renamed", |
79 |
| - FileName="TestDetection.ps1" |
| 82 | + RenameSymbolParams request = new() |
| 83 | + { |
| 84 | + Column = 21, |
| 85 | + Line = 3, |
| 86 | + RenameTo = "Renamed", |
| 87 | + FileName = "TestDetection.ps1" |
80 | 88 | };
|
81 | 89 | ScriptFile scriptFile = GetTestScript(request.FileName);
|
82 | 90 |
|
83 |
| - Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst); |
84 |
| - Assert.Equal(3,symbol.Extent.StartLineNumber); |
85 |
| - Assert.Equal(17,symbol.Extent.StartColumnNumber); |
| 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 | 95 |
|
87 | 96 | }
|
88 | 97 | [Fact]
|
89 | 98 | public void GetHashTableKey()
|
90 | 99 | {
|
91 |
| - RenameSymbolParams request = new(){ |
92 |
| - Column=9, |
93 |
| - Line=16, |
94 |
| - RenameTo="Renamed", |
95 |
| - FileName="TestDetection.ps1" |
| 100 | + RenameSymbolParams request = new() |
| 101 | + { |
| 102 | + Column = 9, |
| 103 | + Line = 16, |
| 104 | + RenameTo = "Renamed", |
| 105 | + FileName = "TestDetection.ps1" |
96 | 106 | };
|
97 | 107 | ScriptFile scriptFile = GetTestScript(request.FileName);
|
98 |
| - |
99 |
| - Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst); |
100 |
| - Assert.Equal(16,symbol.Extent.StartLineNumber); |
101 |
| - Assert.Equal(5,symbol.Extent.StartColumnNumber); |
| 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); |
102 | 118 |
|
103 | 119 | }
|
104 | 120 | [Fact]
|
105 | 121 | public void GetVariableWithinCommandAst()
|
106 | 122 | {
|
107 |
| - RenameSymbolParams request = new(){ |
108 |
| - Column=29, |
109 |
| - Line=6, |
110 |
| - RenameTo="Renamed", |
111 |
| - FileName="TestDetection.ps1" |
| 123 | + RenameSymbolParams request = new() |
| 124 | + { |
| 125 | + Column = 29, |
| 126 | + Line = 6, |
| 127 | + RenameTo = "Renamed", |
| 128 | + FileName = "TestDetection.ps1" |
112 | 129 | };
|
113 | 130 | ScriptFile scriptFile = GetTestScript(request.FileName);
|
114 | 131 |
|
115 |
| - Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst); |
116 |
| - Assert.Equal(6,symbol.Extent.StartLineNumber); |
117 |
| - Assert.Equal(28,symbol.Extent.StartColumnNumber); |
| 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 | 135 |
|
119 | 136 | }
|
120 | 137 | [Fact]
|
121 | 138 | public void GetCommandParameterAst()
|
122 | 139 | {
|
123 |
| - RenameSymbolParams request = new(){ |
124 |
| - Column=12, |
125 |
| - Line=21, |
126 |
| - RenameTo="Renamed", |
127 |
| - FileName="TestDetection.ps1" |
| 140 | + RenameSymbolParams request = new() |
| 141 | + { |
| 142 | + Column = 12, |
| 143 | + Line = 21, |
| 144 | + RenameTo = "Renamed", |
| 145 | + FileName = "TestDetection.ps1" |
128 | 146 | };
|
129 | 147 | ScriptFile scriptFile = GetTestScript(request.FileName);
|
130 | 148 |
|
131 |
| - Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst); |
132 |
| - Assert.Equal(21,symbol.Extent.StartLineNumber); |
133 |
| - Assert.Equal(10,symbol.Extent.StartColumnNumber); |
| 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 | 153 |
|
135 | 154 | }
|
136 | 155 | [Fact]
|
137 | 156 | public void GetFunctionDefinitionAst()
|
138 | 157 | {
|
139 |
| - RenameSymbolParams request = new(){ |
140 |
| - Column=12, |
141 |
| - Line=1, |
142 |
| - RenameTo="Renamed", |
143 |
| - FileName="TestDetection.ps1" |
| 158 | + RenameSymbolParams request = new() |
| 159 | + { |
| 160 | + Column = 16, |
| 161 | + Line = 1, |
| 162 | + RenameTo = "Renamed", |
| 163 | + FileName = "TestDetection.ps1" |
144 | 164 | };
|
145 | 165 | ScriptFile scriptFile = GetTestScript(request.FileName);
|
146 | 166 |
|
147 |
| - Ast symbol = Utilities.GetAst(request.Line,request.Column,scriptFile.ScriptAst); |
148 |
| - Assert.Equal(1,symbol.Extent.StartLineNumber); |
149 |
| - Assert.Equal(1,symbol.Extent.StartColumnNumber); |
150 |
| - |
| 167 | + Ast symbol = Utilities.GetAst(request.Line, request.Column, scriptFile.ScriptAst); |
| 168 | + Assert.IsType<FunctionDefinitionAst>(symbol); |
| 169 | + Assert.Equal(1, symbol.Extent.StartLineNumber); |
| 170 | + Assert.Equal(1, symbol.Extent.StartColumnNumber); |
151 | 171 | }
|
152 | 172 | }
|
153 | 173 | }
|
0 commit comments