hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#: Add stable order for generated accessors in printed AST

Browse Source
This commit is contained in:
Tamas Vajk
2020-09-04 10:37:38 +02:00
parent 58f51899c9
commit e2c205deb4
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
csharp/ql/src/semmle/code/csharp/PrintAst.qll
View File

@@ -332,11 +332,12 @@ final class DeclarationWithAccessorsNode extends ElementNode {
result.(ElementNode).getElement() = declaration.(Property).getInitializer().getParent()
or
result.(ElementNode).getElement() =
rank[childIndex - 2](Element a, string file, int line, int column |
rank[childIndex - 2](Element a, string file, int line, int column, string name |
a = declaration.getAnAccessor() and
locationSortKeys(a, file, line, column)
locationSortKeys(a, file, line, column) and
name = a.toString()
|
a order by file, line, column
a order by file, line, column, name
)
}
}

2
csharp/ql/test/experimental/ir/ir/PrintAst.expected
View File

@@ -312,7 +312,7 @@ events.cs:
# 6| 3: [AddEventAccessor] add_MyEvent
#-----| 2: (Parameters)
# 6| 0: [Parameter] value
# 6| 3: [RemoveEventAccessor] remove_MyEvent
# 6| 4: [RemoveEventAccessor] remove_MyEvent
#-----| 2: (Parameters)
# 6| 0: [Parameter] value
# 8| 7: [InstanceConstructor] Events

2
csharp/ql/test/library-tests/assignments/PrintAst.expected
View File

@@ -50,6 +50,6 @@ Assignments.cs:
# 23| 3: [AddEventAccessor] add_Event
#-----| 2: (Parameters)
# 23| 0: [Parameter] value
# 23| 3: [RemoveEventAccessor] remove_Event
# 23| 4: [RemoveEventAccessor] remove_Event
#-----| 2: (Parameters)
# 23| 0: [Parameter] value

2
csharp/ql/test/library-tests/csharp8/PrintAst.expected
View File

@@ -189,7 +189,7 @@ NullableRefTypes.cs:
# 48| 3: [AddEventAccessor] add_P
#-----| 2: (Parameters)
# 48| 0: [Parameter] value
# 48| 3: [RemoveEventAccessor] remove_P
# 48| 4: [RemoveEventAccessor] remove_P
#-----| 2: (Parameters)
# 48| 0: [Parameter] value
# 51| 25: [Method] Q

4
csharp/ql/test/library-tests/definitions/PrintAst.expected
View File

@@ -178,7 +178,7 @@ definitions.cs:
# 101| 3: [AddEventAccessor] add_Click
#-----| 2: (Parameters)
# 101| 0: [Parameter] value
# 101| 3: [RemoveEventAccessor] remove_Click
# 101| 4: [RemoveEventAccessor] remove_Click
#-----| 2: (Parameters)
# 101| 0: [Parameter] value
# 103| 7: [Method] M
@@ -257,7 +257,7 @@ definitions.cs:
# 145| 3: [AddEventAccessor] add_EH
#-----| 2: (Parameters)
# 145| 0: [Parameter] value
# 145| 3: [RemoveEventAccessor] remove_EH
# 145| 4: [RemoveEventAccessor] remove_EH
#-----| 2: (Parameters)
# 145| 0: [Parameter] value
# 146| 5: [Method] M

2
csharp/ql/test/library-tests/events/PrintAst.expected
View File

@@ -9,7 +9,7 @@ events.cs:
# 13| 3: [AddEventAccessor] add_Click
#-----| 2: (Parameters)
# 13| 0: [Parameter] value
# 13| 3: [RemoveEventAccessor] remove_Click
# 13| 4: [RemoveEventAccessor] remove_Click
#-----| 2: (Parameters)
# 13| 0: [Parameter] value
# 15| 6: [Method] OnClick

2
csharp/ql/test/library-tests/expressions/PrintAst.expected
View File

@@ -941,7 +941,7 @@ expressions.cs:
# 229| 3: [AddEventAccessor] add_Click
#-----| 2: (Parameters)
# 229| 0: [Parameter] value
# 229| 3: [RemoveEventAccessor] remove_Click
# 229| 4: [RemoveEventAccessor] remove_Click
#-----| 2: (Parameters)
# 229| 0: [Parameter] value
# 231| 6: [Method] OnClick

2
csharp/ql/test/library-tests/generics/PrintAst.expected
View File

@@ -229,7 +229,7 @@ generics.cs:
# 37| 3: [AddEventAccessor] add_myEvent
#-----| 2: (Parameters)
# 37| 0: [Parameter] value
# 37| 3: [RemoveEventAccessor] remove_myEvent
# 37| 4: [RemoveEventAccessor] remove_myEvent
#-----| 2: (Parameters)
# 37| 0: [Parameter] value
# 39| 12: [IncrementOperator] ++

12
csharp/ql/test/library-tests/members/PrintAst.expected
View File

@@ -36,7 +36,7 @@ Members.cs:
# 20| 3: [AddEventAccessor] add_Event
#-----| 2: (Parameters)
# 20| 0: [Parameter] value
# 20| 3: [RemoveEventAccessor] remove_Event
# 20| 4: [RemoveEventAccessor] remove_Event
#-----| 2: (Parameters)
# 20| 0: [Parameter] value
# 24| 6: [Method] Method
@@ -64,7 +64,7 @@ Members.cs:
# 32| 3: [AddEventAccessor] add_Event
#-----| 2: (Parameters)
# 32| 0: [Parameter] value
# 32| 3: [RemoveEventAccessor] remove_Event
# 32| 4: [RemoveEventAccessor] remove_Event
#-----| 2: (Parameters)
# 32| 0: [Parameter] value
# 35| 3: [Class] Class2
@@ -99,7 +99,7 @@ Members.cs:
# 43| 3: [AddEventAccessor] add_Event
#-----| 2: (Parameters)
# 43| 0: [Parameter] value
# 43| 3: [RemoveEventAccessor] remove_Event
# 43| 4: [RemoveEventAccessor] remove_Event
#-----| 2: (Parameters)
# 43| 0: [Parameter] value
# 46| 6: [Method] Method
@@ -127,7 +127,7 @@ Members.cs:
# 50| 3: [AddEventAccessor] add_Event
#-----| 2: (Parameters)
# 50| 0: [Parameter] value
# 50| 3: [RemoveEventAccessor] remove_Event
# 50| 4: [RemoveEventAccessor] remove_Event
#-----| 2: (Parameters)
# 50| 0: [Parameter] value
# 54| 4: [Interface] Interface
@@ -151,7 +151,7 @@ Members.cs:
# 59| 3: [AddEventAccessor] add_Event
#-----| 2: (Parameters)
# 59| 0: [Parameter] value
# 59| 3: [RemoveEventAccessor] remove_Event
# 59| 4: [RemoveEventAccessor] remove_Event
#-----| 2: (Parameters)
# 59| 0: [Parameter] value
# 62| 5: [Interface] Interface2
@@ -175,7 +175,7 @@ Members.cs:
# 67| 3: [AddEventAccessor] add_Event
#-----| 2: (Parameters)
# 67| 0: [Parameter] value
# 67| 3: [RemoveEventAccessor] remove_Event
# 67| 4: [RemoveEventAccessor] remove_Event
#-----| 2: (Parameters)
# 67| 0: [Parameter] value
# 71| 6: [Enum] Enum