Skip to content

Commit c71ea80

Browse files
igfooigfoo
committed
Kotlin: Accept test changes
We now get better locations, with Kotlin 1.8.0.
1 parent 20b35e5 commit c71ea80

File tree

1 file changed

+50
-50
lines changed
  • java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency

1 file changed

+50
-50
lines changed

‎java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/PrintAst.expected

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -146,25 +146,24 @@ test.kt:
146146
# 19| 1: [Annotation] VarargAnnotation
147147
# 0| 1: [ArrayInit] {...}
148148
# 20| 2: [Annotation] VarargAnnotation
149-
# 0| 1: [ArrayInit] {...}
150-
# 0| 1: [IntegerLiteral] 1
149+
# 20| 1: [ArrayInit] {...}
150+
# 20| 1: [IntegerLiteral] 1
151151
# 21| 3: [Annotation] VarargAnnotation
152-
# 0| 1: [ArrayInit] {...}
153-
# 0| 1: [IntegerLiteral] 1
154-
# 0| 2: [IntegerLiteral] 2
152+
# 21| 1: [ArrayInit] {...}
153+
# 21| 1: [IntegerLiteral] 1
154+
# 21| 2: [IntegerLiteral] 2
155155
# 22| 4: [Annotation] VarargAnnotation
156-
# 0| 1: [ArrayInit] {...}
157-
# 0| 1: [IntegerLiteral] 1
158-
# 0| 2: [IntegerLiteral] 2
159-
# 0| 3: [IntegerLiteral] 3
156+
# 22| 1: [ArrayInit] {...}
157+
# 22| 1: [IntegerLiteral] 1
158+
# 22| 2: [IntegerLiteral] 2
159+
# 22| 3: [IntegerLiteral] 3
160160
# 23| 5: [Annotation] VarargAnnotation
161-
# 0| 1: [ArrayInit] {...}
162-
# 0| 1: [IntegerLiteral] 1
163-
# 0| 2: [IntegerLiteral] 2
164-
# 0| 3: [IntegerLiteral] 3
161+
# 23| 1: [ArrayInit] {...}
162+
# 23| 1: [IntegerLiteral] 1
163+
# 23| 2: [IntegerLiteral] 2
164+
# 23| 3: [IntegerLiteral] 3
165165
# 17| 2: [Annotation] Ann1
166-
# 0| 1: [IntegerLiteral] 1
167-
# 0| 2: [Annotation] Ann2
166+
# 0| 1: [Annotation] Ann2
168167
# 0| 1: [StringLiteral] "Hello"
169168
# 0| 2: [TypeLiteral] String.class
170169
# 0| 0: [TypeAccess] String
@@ -182,16 +181,17 @@ test.kt:
182181
# 0| 0: [TypeAccess] String
183182
# 0| 2: [TypeLiteral] int.class
184183
# 0| 0: [TypeAccess] int
185-
# 0| 3: [VarAccess] DayOfWeek.MONDAY
186-
# 0| -1: [TypeAccess] DayOfWeek
184+
# 17| 2: [IntegerLiteral] 1
185+
# 17| 3: [VarAccess] DayOfWeek.MONDAY
186+
# 17| -1: [TypeAccess] DayOfWeek
187187
# 18| 3: [Annotation] GenericAnnotation
188-
# 0| 1: [TypeLiteral] String.class
189-
# 0| 0: [TypeAccess] String
190-
# 0| 2: [ArrayInit] {...}
191-
# 0| 1: [TypeLiteral] String.class
192-
# 0| 0: [TypeAccess] String
193-
# 0| 2: [TypeLiteral] String.class
194-
# 0| 0: [TypeAccess] String
188+
# 18| 1: [TypeLiteral] String.class
189+
# 18| 0: [TypeAccess] String
190+
# 18| 2: [ArrayInit] {...}
191+
# 18| 1: [TypeLiteral] String.class
192+
# 18| 0: [TypeAccess] String
193+
# 18| 2: [TypeLiteral] String.class
194+
# 18| 0: [TypeAccess] String
195195
# 24| 4: [Annotation] AnnWithDefaults
196196
# 0| 1: [IntegerLiteral] 1
197197
# 0| 2: [StringLiteral] "hello"
@@ -211,25 +211,24 @@ test.kt:
211211
# 29| 1: [Annotation] VarargAnnotation
212212
# 0| 1: [ArrayInit] {...}
213213
# 30| 2: [Annotation] VarargAnnotation
214-
# 0| 1: [ArrayInit] {...}
215-
# 0| 1: [IntegerLiteral] 1
214+
# 30| 1: [ArrayInit] {...}
215+
# 30| 1: [IntegerLiteral] 1
216216
# 31| 3: [Annotation] VarargAnnotation
217-
# 0| 1: [ArrayInit] {...}
218-
# 0| 1: [IntegerLiteral] 1
219-
# 0| 2: [IntegerLiteral] 2
217+
# 31| 1: [ArrayInit] {...}
218+
# 31| 1: [IntegerLiteral] 1
219+
# 31| 2: [IntegerLiteral] 2
220220
# 32| 4: [Annotation] VarargAnnotation
221-
# 0| 1: [ArrayInit] {...}
222-
# 0| 1: [IntegerLiteral] 1
223-
# 0| 2: [IntegerLiteral] 2
224-
# 0| 3: [IntegerLiteral] 3
221+
# 32| 1: [ArrayInit] {...}
222+
# 32| 1: [IntegerLiteral] 1
223+
# 32| 2: [IntegerLiteral] 2
224+
# 32| 3: [IntegerLiteral] 3
225225
# 33| 5: [Annotation] VarargAnnotation
226-
# 0| 1: [ArrayInit] {...}
227-
# 0| 1: [IntegerLiteral] 1
228-
# 0| 2: [IntegerLiteral] 2
229-
# 0| 3: [IntegerLiteral] 3
226+
# 33| 1: [ArrayInit] {...}
227+
# 33| 1: [IntegerLiteral] 1
228+
# 33| 2: [IntegerLiteral] 2
229+
# 33| 3: [IntegerLiteral] 3
230230
# 27| 2: [Annotation] Ann1
231-
# 0| 1: [IntegerLiteral] 1
232-
# 0| 2: [Annotation] Ann2
231+
# 0| 1: [Annotation] Ann2
233232
# 0| 1: [StringLiteral] "Hello"
234233
# 0| 2: [TypeLiteral] String.class
235234
# 0| 0: [TypeAccess] String
@@ -247,16 +246,17 @@ test.kt:
247246
# 0| 0: [TypeAccess] String
248247
# 0| 2: [TypeLiteral] int.class
249248
# 0| 0: [TypeAccess] int
250-
# 0| 3: [VarAccess] DayOfWeek.MONDAY
251-
# 0| -1: [TypeAccess] DayOfWeek
249+
# 27| 2: [IntegerLiteral] 1
250+
# 27| 3: [VarAccess] DayOfWeek.MONDAY
251+
# 27| -1: [TypeAccess] DayOfWeek
252252
# 28| 3: [Annotation] GenericAnnotation
253-
# 0| 1: [TypeLiteral] String.class
254-
# 0| 0: [TypeAccess] String
255-
# 0| 2: [ArrayInit] {...}
256-
# 0| 1: [TypeLiteral] String.class
257-
# 0| 0: [TypeAccess] String
258-
# 0| 2: [TypeLiteral] String.class
259-
# 0| 0: [TypeAccess] String
253+
# 28| 1: [TypeLiteral] String.class
254+
# 28| 0: [TypeAccess] String
255+
# 28| 2: [ArrayInit] {...}
256+
# 28| 1: [TypeLiteral] String.class
257+
# 28| 0: [TypeAccess] String
258+
# 28| 2: [TypeLiteral] String.class
259+
# 28| 0: [TypeAccess] String
260260
# 34| 4: [Annotation] AnnWithDefaults
261261
# 0| 1: [IntegerLiteral] 1
262262
# 0| 2: [StringLiteral] "hello"
@@ -279,7 +279,7 @@ test.kt:
279279
# 40| 11: [Class] HasKotlinDeprecatedAnnotationUsedByJava
280280
#-----| -3: (Annotations)
281281
# 40| 1: [Annotation] Deprecated
282-
# 0| 1: [StringLiteral] "Kotlin deprecation message 1"
282+
# 40| 1: [StringLiteral] "Kotlin deprecation message 1"
283283
# 41| 1: [Constructor] HasKotlinDeprecatedAnnotationUsedByJava
284284
# 40| 5: [BlockStmt] { ... }
285285
# 40| 0: [SuperConstructorInvocationStmt] super(...)
@@ -294,7 +294,7 @@ test.kt:
294294
# 46| 13: [Class] HasKotlinDeprecatedAnnotationUsedByKotlin
295295
#-----| -3: (Annotations)
296296
# 46| 1: [Annotation] Deprecated
297-
# 0| 1: [StringLiteral] "Kotlin deprecation message 2"
297+
# 46| 1: [StringLiteral] "Kotlin deprecation message 2"
298298
# 47| 1: [Constructor] HasKotlinDeprecatedAnnotationUsedByKotlin
299299
# 46| 5: [BlockStmt] { ... }
300300
# 46| 0: [SuperConstructorInvocationStmt] super(...)

0 commit comments

Comments
 (0)