Skip to content

Commit e2c205d

Browse files
tamasvajktamasvajk
committed
C#: Add stable order for generated accessors in printed AST
1 parent 58f5189 commit e2c205d

File tree

9 files changed

+18
-17
lines changed

9 files changed

+18
-17
lines changed

‎csharp/ql/src/semmle/code/csharp/PrintAst.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,12 @@ final class DeclarationWithAccessorsNode extends ElementNode {
332332
result.(ElementNode).getElement() = declaration.(Property).getInitializer().getParent()
333333
or
334334
result.(ElementNode).getElement() =
335-
rank[childIndex - 2](Element a, string file, int line, int column |
335+
rank[childIndex - 2](Element a, string file, int line, int column, string name |
336336
a = declaration.getAnAccessor() and
337-
locationSortKeys(a, file, line, column)
337+
locationSortKeys(a, file, line, column) and
338+
name = a.toString()
338339
|
339-
a order by file, line, column
340+
a order by file, line, column, name
340341
)
341342
}
342343
}

‎csharp/ql/test/experimental/ir/ir/PrintAst.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ events.cs:
312312
# 6| 3: [AddEventAccessor] add_MyEvent
313313
#-----| 2: (Parameters)
314314
# 6| 0: [Parameter] value
315-
# 6| 3: [RemoveEventAccessor] remove_MyEvent
315+
# 6| 4: [RemoveEventAccessor] remove_MyEvent
316316
#-----| 2: (Parameters)
317317
# 6| 0: [Parameter] value
318318
# 8| 7: [InstanceConstructor] Events

‎csharp/ql/test/library-tests/assignments/PrintAst.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ Assignments.cs:
5050
# 23| 3: [AddEventAccessor] add_Event
5151
#-----| 2: (Parameters)
5252
# 23| 0: [Parameter] value
53-
# 23| 3: [RemoveEventAccessor] remove_Event
53+
# 23| 4: [RemoveEventAccessor] remove_Event
5454
#-----| 2: (Parameters)
5555
# 23| 0: [Parameter] value

‎csharp/ql/test/library-tests/csharp8/PrintAst.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ NullableRefTypes.cs:
189189
# 48| 3: [AddEventAccessor] add_P
190190
#-----| 2: (Parameters)
191191
# 48| 0: [Parameter] value
192-
# 48| 3: [RemoveEventAccessor] remove_P
192+
# 48| 4: [RemoveEventAccessor] remove_P
193193
#-----| 2: (Parameters)
194194
# 48| 0: [Parameter] value
195195
# 51| 25: [Method] Q

‎csharp/ql/test/library-tests/definitions/PrintAst.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ definitions.cs:
178178
# 101| 3: [AddEventAccessor] add_Click
179179
#-----| 2: (Parameters)
180180
# 101| 0: [Parameter] value
181-
# 101| 3: [RemoveEventAccessor] remove_Click
181+
# 101| 4: [RemoveEventAccessor] remove_Click
182182
#-----| 2: (Parameters)
183183
# 101| 0: [Parameter] value
184184
# 103| 7: [Method] M
@@ -257,7 +257,7 @@ definitions.cs:
257257
# 145| 3: [AddEventAccessor] add_EH
258258
#-----| 2: (Parameters)
259259
# 145| 0: [Parameter] value
260-
# 145| 3: [RemoveEventAccessor] remove_EH
260+
# 145| 4: [RemoveEventAccessor] remove_EH
261261
#-----| 2: (Parameters)
262262
# 145| 0: [Parameter] value
263263
# 146| 5: [Method] M

‎csharp/ql/test/library-tests/events/PrintAst.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ events.cs:
99
# 13| 3: [AddEventAccessor] add_Click
1010
#-----| 2: (Parameters)
1111
# 13| 0: [Parameter] value
12-
# 13| 3: [RemoveEventAccessor] remove_Click
12+
# 13| 4: [RemoveEventAccessor] remove_Click
1313
#-----| 2: (Parameters)
1414
# 13| 0: [Parameter] value
1515
# 15| 6: [Method] OnClick

‎csharp/ql/test/library-tests/expressions/PrintAst.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ expressions.cs:
941941
# 229| 3: [AddEventAccessor] add_Click
942942
#-----| 2: (Parameters)
943943
# 229| 0: [Parameter] value
944-
# 229| 3: [RemoveEventAccessor] remove_Click
944+
# 229| 4: [RemoveEventAccessor] remove_Click
945945
#-----| 2: (Parameters)
946946
# 229| 0: [Parameter] value
947947
# 231| 6: [Method] OnClick

‎csharp/ql/test/library-tests/generics/PrintAst.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ generics.cs:
229229
# 37| 3: [AddEventAccessor] add_myEvent
230230
#-----| 2: (Parameters)
231231
# 37| 0: [Parameter] value
232-
# 37| 3: [RemoveEventAccessor] remove_myEvent
232+
# 37| 4: [RemoveEventAccessor] remove_myEvent
233233
#-----| 2: (Parameters)
234234
# 37| 0: [Parameter] value
235235
# 39| 12: [IncrementOperator] ++

‎csharp/ql/test/library-tests/members/PrintAst.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Members.cs:
3636
# 20| 3: [AddEventAccessor] add_Event
3737
#-----| 2: (Parameters)
3838
# 20| 0: [Parameter] value
39-
# 20| 3: [RemoveEventAccessor] remove_Event
39+
# 20| 4: [RemoveEventAccessor] remove_Event
4040
#-----| 2: (Parameters)
4141
# 20| 0: [Parameter] value
4242
# 24| 6: [Method] Method
@@ -64,7 +64,7 @@ Members.cs:
6464
# 32| 3: [AddEventAccessor] add_Event
6565
#-----| 2: (Parameters)
6666
# 32| 0: [Parameter] value
67-
# 32| 3: [RemoveEventAccessor] remove_Event
67+
# 32| 4: [RemoveEventAccessor] remove_Event
6868
#-----| 2: (Parameters)
6969
# 32| 0: [Parameter] value
7070
# 35| 3: [Class] Class2
@@ -99,7 +99,7 @@ Members.cs:
9999
# 43| 3: [AddEventAccessor] add_Event
100100
#-----| 2: (Parameters)
101101
# 43| 0: [Parameter] value
102-
# 43| 3: [RemoveEventAccessor] remove_Event
102+
# 43| 4: [RemoveEventAccessor] remove_Event
103103
#-----| 2: (Parameters)
104104
# 43| 0: [Parameter] value
105105
# 46| 6: [Method] Method
@@ -127,7 +127,7 @@ Members.cs:
127127
# 50| 3: [AddEventAccessor] add_Event
128128
#-----| 2: (Parameters)
129129
# 50| 0: [Parameter] value
130-
# 50| 3: [RemoveEventAccessor] remove_Event
130+
# 50| 4: [RemoveEventAccessor] remove_Event
131131
#-----| 2: (Parameters)
132132
# 50| 0: [Parameter] value
133133
# 54| 4: [Interface] Interface
@@ -151,7 +151,7 @@ Members.cs:
151151
# 59| 3: [AddEventAccessor] add_Event
152152
#-----| 2: (Parameters)
153153
# 59| 0: [Parameter] value
154-
# 59| 3: [RemoveEventAccessor] remove_Event
154+
# 59| 4: [RemoveEventAccessor] remove_Event
155155
#-----| 2: (Parameters)
156156
# 59| 0: [Parameter] value
157157
# 62| 5: [Interface] Interface2
@@ -175,7 +175,7 @@ Members.cs:
175175
# 67| 3: [AddEventAccessor] add_Event
176176
#-----| 2: (Parameters)
177177
# 67| 0: [Parameter] value
178-
# 67| 3: [RemoveEventAccessor] remove_Event
178+
# 67| 4: [RemoveEventAccessor] remove_Event
179179
#-----| 2: (Parameters)
180180
# 67| 0: [Parameter] value
181181
# 71| 6: [Enum] Enum

0 commit comments

Comments
 (0)