Skip to content

Commit 3367da8

Browse files
igfooigfoo
committed
Kotlin: Accept test changes
We get better locations with Kotlin 1.8.0.
1 parent b7eb521 commit 3367da8

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

‎java/ql/test/kotlin/library-tests/annotation_classes/PrintAst.expected

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -108,39 +108,39 @@ def.kt:
108108
# 0| 9: [VarAccess] ElementType.TYPE_USE
109109
# 0| -1: [TypeAccess] ElementType
110110
# 5| 3: [Annotation] Target
111-
# 0| 1: [ArrayInit] {...}
112-
# 0| 1: [VarAccess] AnnotationTarget.CLASS
113-
# 0| -1: [TypeAccess] AnnotationTarget
114-
# 0| 2: [VarAccess] AnnotationTarget.ANNOTATION_CLASS
115-
# 0| -1: [TypeAccess] AnnotationTarget
116-
# 0| 3: [VarAccess] AnnotationTarget.TYPE_PARAMETER
117-
# 0| -1: [TypeAccess] AnnotationTarget
118-
# 0| 4: [VarAccess] AnnotationTarget.PROPERTY
119-
# 0| -1: [TypeAccess] AnnotationTarget
120-
# 0| 5: [VarAccess] AnnotationTarget.FIELD
121-
# 0| -1: [TypeAccess] AnnotationTarget
122-
# 0| 6: [VarAccess] AnnotationTarget.LOCAL_VARIABLE
123-
# 0| -1: [TypeAccess] AnnotationTarget
124-
# 0| 7: [VarAccess] AnnotationTarget.VALUE_PARAMETER
125-
# 0| -1: [TypeAccess] AnnotationTarget
126-
# 0| 8: [VarAccess] AnnotationTarget.CONSTRUCTOR
127-
# 0| -1: [TypeAccess] AnnotationTarget
128-
# 0| 9: [VarAccess] AnnotationTarget.FUNCTION
129-
# 0| -1: [TypeAccess] AnnotationTarget
130-
# 0| 10: [VarAccess] AnnotationTarget.PROPERTY_GETTER
131-
# 0| -1: [TypeAccess] AnnotationTarget
132-
# 0| 11: [VarAccess] AnnotationTarget.PROPERTY_SETTER
133-
# 0| -1: [TypeAccess] AnnotationTarget
134-
# 0| 12: [VarAccess] AnnotationTarget.TYPE
135-
# 0| -1: [TypeAccess] AnnotationTarget
136-
# 0| 13: [VarAccess] AnnotationTarget.FILE
137-
# 0| -1: [TypeAccess] AnnotationTarget
138-
# 0| 14: [VarAccess] AnnotationTarget.TYPEALIAS
139-
# 0| -1: [TypeAccess] AnnotationTarget
111+
# 5| 1: [ArrayInit] {...}
112+
# 5| 1: [VarAccess] AnnotationTarget.CLASS
113+
# 5| -1: [TypeAccess] AnnotationTarget
114+
# 5| 2: [VarAccess] AnnotationTarget.ANNOTATION_CLASS
115+
# 5| -1: [TypeAccess] AnnotationTarget
116+
# 5| 3: [VarAccess] AnnotationTarget.TYPE_PARAMETER
117+
# 5| -1: [TypeAccess] AnnotationTarget
118+
# 5| 4: [VarAccess] AnnotationTarget.PROPERTY
119+
# 5| -1: [TypeAccess] AnnotationTarget
120+
# 5| 5: [VarAccess] AnnotationTarget.FIELD
121+
# 5| -1: [TypeAccess] AnnotationTarget
122+
# 5| 6: [VarAccess] AnnotationTarget.LOCAL_VARIABLE
123+
# 5| -1: [TypeAccess] AnnotationTarget
124+
# 5| 7: [VarAccess] AnnotationTarget.VALUE_PARAMETER
125+
# 5| -1: [TypeAccess] AnnotationTarget
126+
# 5| 8: [VarAccess] AnnotationTarget.CONSTRUCTOR
127+
# 5| -1: [TypeAccess] AnnotationTarget
128+
# 5| 9: [VarAccess] AnnotationTarget.FUNCTION
129+
# 5| -1: [TypeAccess] AnnotationTarget
130+
# 5| 10: [VarAccess] AnnotationTarget.PROPERTY_GETTER
131+
# 5| -1: [TypeAccess] AnnotationTarget
132+
# 5| 11: [VarAccess] AnnotationTarget.PROPERTY_SETTER
133+
# 5| -1: [TypeAccess] AnnotationTarget
134+
# 5| 12: [VarAccess] AnnotationTarget.TYPE
135+
# 5| -1: [TypeAccess] AnnotationTarget
136+
# 5| 13: [VarAccess] AnnotationTarget.FILE
137+
# 5| -1: [TypeAccess] AnnotationTarget
138+
# 5| 14: [VarAccess] AnnotationTarget.TYPEALIAS
139+
# 5| -1: [TypeAccess] AnnotationTarget
140140
# 21| 1: [Method] a
141141
#-----| 1: (Annotations)
142142
# 21| 1: [Annotation] JvmName
143-
# 0| 1: [StringLiteral] "a"
143+
# 21| 1: [StringLiteral] "a"
144144
# 21| 3: [TypeAccess] int
145145
# 23| 3: [Interface] Annot1k
146146
#-----| -3: (Annotations)
@@ -201,21 +201,21 @@ def.kt:
201201
# 38| 6: [Class] Z
202202
#-----| -3: (Annotations)
203203
# 38| 1: [Annotation] Annot0k
204-
# 0| 1: [IntegerLiteral] 1
204+
# 38| 1: [IntegerLiteral] 1
205205
# 39| 2: [Annotation] Annot1k
206206
# 0| 1: [IntegerLiteral] 2
207207
# 0| 2: [StringLiteral] "ab"
208208
# 0| 3: [TypeLiteral] X.class
209209
# 0| 0: [TypeAccess] X
210-
# 0| 4: [VarAccess] Y.B
211-
# 0| -1: [TypeAccess] Y
212-
# 0| 5: [ArrayInit] {...}
213-
# 0| 1: [VarAccess] Y.C
214-
# 0| -1: [TypeAccess] Y
215-
# 0| 2: [VarAccess] Y.A
216-
# 0| -1: [TypeAccess] Y
217-
# 0| 6: [Annotation] Annot0k
210+
# 0| 4: [Annotation] Annot0k
218211
# 0| 1: [IntegerLiteral] 1
212+
# 39| 5: [VarAccess] Y.B
213+
# 39| -1: [TypeAccess] Y
214+
# 39| 6: [ArrayInit] {...}
215+
# 39| 1: [VarAccess] Y.C
216+
# 39| -1: [TypeAccess] Y
217+
# 39| 2: [VarAccess] Y.A
218+
# 39| -1: [TypeAccess] Y
219219
# 42| 1: [Constructor] Z
220220
#-----| 1: (Annotations)
221221
# 41| 1: [Annotation] Annot0k

‎java/ql/test/kotlin/library-tests/annotation_classes/classes.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ annotationValues
3636
| def.kt:0:0:0:0 | Retention | def.kt:0:0:0:0 | RetentionPolicy.RUNTIME |
3737
| def.kt:0:0:0:0 | Retention | def.kt:0:0:0:0 | RetentionPolicy.RUNTIME |
3838
| def.kt:0:0:0:0 | Target | def.kt:0:0:0:0 | {...} |
39-
| def.kt:5:1:20:1 | Target | def.kt:0:0:0:0 | {...} |
40-
| def.kt:21:26:21:42 | JvmName | def.kt:0:0:0:0 | "a" |
39+
| def.kt:5:1:20:1 | Target | def.kt:5:9:5:30 | {...} |
40+
| def.kt:21:26:21:42 | JvmName | def.kt:21:39:21:41 | "a" |
4141
| def.kt:23:1:23:8 | Annot0k | def.kt:0:0:0:0 | 0 |
42-
| def.kt:38:1:38:17 | Annot0k | def.kt:0:0:0:0 | 1 |
42+
| def.kt:38:1:38:17 | Annot0k | def.kt:38:16:38:16 | 1 |
4343
| def.kt:39:1:39:40 | Annot1k | def.kt:0:0:0:0 | 2 |
4444
| def.kt:39:1:39:40 | Annot1k | def.kt:0:0:0:0 | "ab" |
4545
| def.kt:39:1:39:40 | Annot1k | def.kt:0:0:0:0 | Annot0k |
4646
| def.kt:39:1:39:40 | Annot1k | def.kt:0:0:0:0 | X.class |
47-
| def.kt:39:1:39:40 | Annot1k | def.kt:0:0:0:0 | Y.B |
48-
| def.kt:39:1:39:40 | Annot1k | def.kt:0:0:0:0 | {...} |
47+
| def.kt:39:1:39:40 | Annot1k | def.kt:39:14:39:16 | Y.B |
48+
| def.kt:39:1:39:40 | Annot1k | def.kt:39:23:39:39 | {...} |
4949
| def.kt:41:5:41:12 | Annot0k | def.kt:0:0:0:0 | 0 |
5050
| def.kt:45:1:45:8 | Annot0k | def.kt:0:0:0:0 | 0 |
5151
| def.kt:46:21:46:28 | Annot0k | def.kt:0:0:0:0 | 0 |

0 commit comments

Comments
 (0)