Kotlin: Accept test changes

Accept test changes from Kotlin 2.3.0 update

Updates expected test outputs for kotlin2 library tests to match
actual compiler output. Changes include:
- Location adjustments for properties/methods (now point to identifiers)
- CastExpr -> ImplicitCastExpr for implicit type casts
- Removed duplicate BlockStmt entries in loop ASTs
- Super constructor call location changes

Note that in Kotlin 2.3.0 super constructor calls now have locations spanning
entire class declarations instead of the actual super call site.

Author: andersfugmann

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_8_0/IrSimpleTypeImplCompat.kt

@@ -22,13 +22,13 @@ Annot1j.java:
 def.kt:
 #    0| [CompilationUnit] def
 #    0|   1: [Class] DefKt
-#   45|     2: [Method] fn
+#   46|     2: [Method] fn
 #-----|       1: (Annotations)
 #   45|         1: [Annotation] Annot0k
 #   21|           1: [IntegerLiteral] 0
 #-----|       2: (Generic Parameters)
 #   46|         0: [TypeVariable] T
-#   45|       3: [TypeAccess] Unit
+#   46|       3: [TypeAccess] Unit
 #-----|       4: (Parameters)
 #   46|         0: [Parameter] a
 #-----|           -1: (Annotations)
@@ -41,38 +41,38 @@ def.kt:
 #   47|             -1: [TypeAccess] ConsoleKt
 #   47|             0: [MethodCall] a(...)
 #   47|               -1: [VarAccess] a
-#   49|         1: [LocalVariableDeclStmt] var ...;
-#   49|           1: [LocalVariableDeclExpr] x
+#   50|         1: [LocalVariableDeclStmt] var ...;
+#   50|           1: [LocalVariableDeclExpr] x
 #   50|             0: [IntegerLiteral] 10
-#   53|     3: [Method] getP
+#   57|     3: [Method] getP
 #-----|       1: (Annotations)
 #   54|         1: [Annotation] Annot0k
 #   21|           1: [IntegerLiteral] 0
-#   53|       3: [TypeAccess] int
-#   53|       5: [BlockStmt] { ... }
-#   53|         0: [ReturnStmt] return ...
-#   53|           0: [VarAccess] DefKt.p
-#   53|             -1: [TypeAccess] DefKt
-#   53|     4: [FieldDeclaration] int p;
+#   57|       3: [TypeAccess] int
+#   57|       5: [BlockStmt] { ... }
+#   57|         0: [ReturnStmt] return ...
+#   57|           0: [VarAccess] DefKt.p
+#   57|             -1: [TypeAccess] DefKt
+#   57|     4: [FieldDeclaration] int p;
 #-----|       -2: (Annotations)
 #   56|         1: [Annotation] Annot0k
 #   21|           1: [IntegerLiteral] 0
-#   53|       -1: [TypeAccess] int
+#   57|       -1: [TypeAccess] int
 #   57|       0: [IntegerLiteral] 5
-#   53|     5: [Method] setP
+#   57|     5: [Method] setP
 #-----|       1: (Annotations)
 #   55|         1: [Annotation] Annot0k
 #   21|           1: [IntegerLiteral] 0
-#   53|       3: [TypeAccess] Unit
+#   57|       3: [TypeAccess] Unit
 #-----|       4: (Parameters)
-#   53|         0: [Parameter] <set-?>
-#   53|           0: [TypeAccess] int
-#   53|       5: [BlockStmt] { ... }
-#   53|         0: [ExprStmt] <Expr>;
-#   53|           0: [AssignExpr] ...=...
-#   53|             0: [VarAccess] DefKt.p
-#   53|               -1: [TypeAccess] DefKt
-#   53|             1: [VarAccess] <set-?>
+#   57|         0: [Parameter] <set-?>
+#   57|           0: [TypeAccess] int
+#   57|       5: [BlockStmt] { ... }
+#   57|         0: [ExprStmt] <Expr>;
+#   57|           0: [AssignExpr] ...=...
+#   57|             0: [VarAccess] DefKt.p
+#   57|               -1: [TypeAccess] DefKt
+#   57|             1: [VarAccess] <set-?>
 #   59|     6: [ExtensionMethod] myExtension
 #   59|       3: [TypeAccess] Unit
 #-----|       4: (Parameters)
@@ -219,13 +219,13 @@ def.kt:
 #   39|             -1: [TypeAccess] Y
 #   39|           2: [VarAccess] Y.A
 #   39|             -1: [TypeAccess] Y
-#   41|     1: [Constructor] Z
+#   42|     1: [Constructor] Z
 #-----|       1: (Annotations)
 #   41|         1: [Annotation] Annot0k
 #   21|           1: [IntegerLiteral] 0
-#   41|       5: [BlockStmt] { ... }
+#   42|       5: [BlockStmt] { ... }
 #   42|         0: [SuperConstructorInvocationStmt] super(...)
-#   41|         1: [BlockStmt] { ... }
+#   42|         1: [BlockStmt] { ... }
 use.java:
 #    0| [CompilationUnit] use
 #    1|   1: [Class] use

java/kotlin-extractor/src/main/kotlin/utils/versions/v_2_3_0-Beta2/IrSimpleTypeImplCompat.kt

@@ -17,7 +17,7 @@ annotationDeclarations
 | Annot1j.java:1:19:1:25 | Annot1j | Annot1j.java:8:7:8:7 | d |
 | Annot1j.java:1:19:1:25 | Annot1j | Annot1j.java:10:9:10:9 | e |
 | Annot1j.java:1:19:1:25 | Annot1j | Annot1j.java:12:13:12:13 | f |
-| def.kt:5:1:21:60 | Annot0k | def.kt:21:26:21:59 | a |
+| def.kt:5:1:21:60 | Annot0k | def.kt:21:44:21:59 | a |
 | def.kt:23:1:31:1 | Annot1k | def.kt:25:5:25:18 | a |
 | def.kt:23:1:31:1 | Annot1k | def.kt:26:5:26:24 | b |
 | def.kt:23:1:31:1 | Annot1k | def.kt:27:5:27:31 | c |
@@ -29,12 +29,12 @@ annotations
 | def.kt:30:22:30:31 | Annot0k | def.kt:39:1:39:40 | Annot1k | def.kt:5:1:21:60 | Annot0k |
 | def.kt:38:1:38:17 | Annot0k | def.kt:38:1:43:1 | Z | def.kt:5:1:21:60 | Annot0k |
 | def.kt:39:1:39:40 | Annot1k | def.kt:38:1:43:1 | Z | def.kt:23:1:31:1 | Annot1k |
-| def.kt:41:5:41:12 | Annot0k | def.kt:41:5:42:19 | Z | def.kt:5:1:21:60 | Annot0k |
-| def.kt:45:1:45:8 | Annot0k | def.kt:45:1:51:1 | fn | def.kt:5:1:21:60 | Annot0k |
+| def.kt:41:5:41:12 | Annot0k | def.kt:42:5:42:19 | Z | def.kt:5:1:21:60 | Annot0k |
+| def.kt:45:1:45:8 | Annot0k | def.kt:46:1:51:1 | fn | def.kt:5:1:21:60 | Annot0k |
 | def.kt:46:21:46:28 | Annot0k | def.kt:46:21:46:39 | a | def.kt:5:1:21:60 | Annot0k |
-| def.kt:54:1:54:12 | Annot0k | def.kt:53:1:57:19 | getP | def.kt:5:1:21:60 | Annot0k |
-| def.kt:55:1:55:12 | Annot0k | def.kt:53:1:57:19 | setP | def.kt:5:1:21:60 | Annot0k |
-| def.kt:56:1:56:14 | Annot0k | def.kt:53:1:57:23 | p | def.kt:5:1:21:60 | Annot0k |
+| def.kt:54:1:54:12 | Annot0k | def.kt:57:1:57:19 | getP | def.kt:5:1:21:60 | Annot0k |
+| def.kt:55:1:55:12 | Annot0k | def.kt:57:1:57:19 | setP | def.kt:5:1:21:60 | Annot0k |
+| def.kt:56:1:56:14 | Annot0k | def.kt:57:1:57:23 | p | def.kt:5:1:21:60 | Annot0k |
 | def.kt:59:5:59:21 | Annot0k | def.kt:59:5:59:28 | <this> | def.kt:5:1:21:60 | Annot0k |
 | use.java:10:5:10:21 | Annot0j | use.java:14:18:14:18 | Z | Annot0j.java:1:19:1:25 | Annot0j |
 | use.java:11:5:11:90 | Annot1j | use.java:14:18:14:18 | Z | Annot1j.java:1:19:1:25 | Annot1j |

java/ql/test-kotlin2/library-tests/annotation_classes/PrintAst.expected

@@ -1,8 +1,8 @@
 | Test.java:2:17:2:17 | m | m | m |
 | test.kt:3:9:4:18 | getX_prop | getX_prop | getX |
 | test.kt:6:5:6:19 | getX | getX | getX |
-| test.kt:8:5:10:14 | changeY | changeY | setY |
-| test.kt:8:5:10:14 | y | y | getY |
-| test.kt:12:5:13:15 | method | method | fn |
+| test.kt:10:5:10:14 | changeY | changeY | setY |
+| test.kt:10:5:10:14 | y | y | getY |
+| test.kt:13:5:13:15 | method | method | fn |
 | test.kt:17:5:17:14 | p | p | p |
-| test.kt:18:5:18:32 | w | w | q |
+| test.kt:18:23:18:32 | w | w | q |

java/ql/test-kotlin2/library-tests/annotation_classes/classes.expected

@@ -2,11 +2,11 @@ thisCall
 | classes.kt:29:26:29:31 | this(...) |
 superCall
 | classes.kt:2:1:2:18 | super(...) |
-| classes.kt:4:16:4:29 | super(...) |
+| classes.kt:4:1:6:1 | super(...) |
 | classes.kt:8:1:10:1 | super(...) |
-| classes.kt:12:23:12:34 | super(...) |
-| classes.kt:17:18:17:28 | super(...) |
-| classes.kt:28:19:28:29 | super(...) |
+| classes.kt:12:1:15:1 | super(...) |
+| classes.kt:17:1:18:1 | super(...) |
+| classes.kt:28:1:30:1 | super(...) |
 | classes.kt:35:27:35:27 | super(...) |
 | classes.kt:63:1:91:1 | super(...) |
 | classes.kt:66:20:66:54 | super(...) |
@@ -41,7 +41,7 @@ superCall
 | classes.kt:151:5:155:5 | super(...) |
 | classes.kt:159:5:159:14 | super(...) |
 | classes.kt:162:13:162:22 | super(...) |
-| generic_anonymous.kt:1:25:1:34 | super(...) |
+| generic_anonymous.kt:1:1:9:1 | super(...) |
 | generic_anonymous.kt:3:19:5:3 | super(...) |
 | generic_anonymous.kt:15:1:33:1 | super(...) |
 | generic_anonymous.kt:25:9:31:9 | super(...) |
@@ -64,5 +64,5 @@ superCall
 | local_anonymous.kt:39:1:45:1 | super(...) |
 | local_anonymous.kt:40:14:44:5 | super(...) |
 | superChain.kt:1:1:1:33 | super(...) |
-| superChain.kt:2:33:2:57 | super(...) |
-| superChain.kt:3:33:3:57 | super(...) |
+| superChain.kt:2:1:2:60 | super(...) |
+| superChain.kt:3:1:3:60 | super(...) |

java/ql/test-kotlin2/library-tests/annotations/jvmName/test.expected

@@ -6,14 +6,14 @@
 | generic_anonymous.kt:1:26:1:33 | t | T |
 | generic_anonymous.kt:1:26:1:33 | this | Generic |
 | generic_anonymous.kt:1:26:1:33 | this.t | T |
-| generic_anonymous.kt:3:3:3:15 | T | T |
-| generic_anonymous.kt:3:3:3:15 | new Object(...) { ... } | new Object(...) { ... } |
-| generic_anonymous.kt:3:3:3:15 | this | Generic |
-| generic_anonymous.kt:3:3:3:15 | this.x | new Object(...) { ... } |
-| generic_anonymous.kt:3:3:5:3 | ...=... | new Object(...) { ... } |
-| generic_anonymous.kt:3:3:5:3 | T | T |
-| generic_anonymous.kt:3:3:5:3 | new Object(...) { ... } | new Object(...) { ... } |
-| generic_anonymous.kt:3:3:5:3 | x | new Object(...) { ... } |
+| generic_anonymous.kt:3:11:3:15 | T | T |
+| generic_anonymous.kt:3:11:3:15 | new Object(...) { ... } | new Object(...) { ... } |
+| generic_anonymous.kt:3:11:3:15 | this | Generic |
+| generic_anonymous.kt:3:11:3:15 | this.x | new Object(...) { ... } |
+| generic_anonymous.kt:3:11:5:3 | ...=... | new Object(...) { ... } |
+| generic_anonymous.kt:3:11:5:3 | T | T |
+| generic_anonymous.kt:3:11:5:3 | new Object(...) { ... } | new Object(...) { ... } |
+| generic_anonymous.kt:3:11:5:3 | x | new Object(...) { ... } |
 | generic_anonymous.kt:3:19:5:3 | <Stmt> | new Object(...) { ... } |
 | generic_anonymous.kt:3:19:5:3 | Object | Object |
 | generic_anonymous.kt:3:19:5:3 | new (...) | new Object(...) { ... } |

java/ql/test-kotlin2/library-tests/classes/ctorCalls.expected

@@ -18,9 +18,9 @@ comments
 commentOwners
 | comments.kt:1:1:1:36 | /** Kdoc owned by CompilationUnit */ | comments.kt:0:0:0:0 | comments |
 | comments.kt:4:1:11:3 | /**\n * A group of *members*.\n *\n * This class has no useful logic; it's just a documentation example.\n *\n * @property name the name of this group.\n * @constructor Creates an empty group.\n */ | comments.kt:12:1:31:1 | Group |
-| comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:23 | getMembers$private |
-| comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | members |
-| comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:5:17:46 | members |
+| comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:13:17:23 | getMembers$private |
+| comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:13:17:46 | members |
+| comments.kt:14:5:16:7 | /**\n     * Members of this group.\n     */ | comments.kt:17:13:17:46 | members |
 | comments.kt:19:5:22:7 | /**\n     * Adds a [member] to this group.\n     * @return the new size of the group.\n     */ | comments.kt:23:5:26:5 | add |
 | comments.kt:48:1:50:3 | /**\n * A type alias comment\n */ | comments.kt:51:1:51:24 | MyType |
 | comments.kt:61:5:63:7 | /**\n     * A prop comment\n     */ | comments.kt:64:5:68:17 | prop |

java/ql/test-kotlin2/library-tests/classes/genericExprTypes.expected

@@ -2,4 +2,4 @@
 | companion_objects.kt:23:5:23:11 | MyClassCompanion | VarAccess | companion_objects.kt:4:9:4:31 | funInCompanion |
 | companion_objects.kt:24:5:24:13 | new MyClass(...) | ClassInstanceExpr | companion_objects.kt:2:5:2:23 | funInClass |
 | companion_objects.kt:25:5:25:15 | MyInterfaceCompanion | VarAccess | companion_objects.kt:11:9:11:31 | funInCompanion |
-| companion_objects.kt:26:5:26:9 | new Imp(...) | ClassInstanceExpr | companion_objects.kt:16:5:18:5 | funInInterface |
+| companion_objects.kt:26:5:26:9 | new Imp(...) | ClassInstanceExpr | companion_objects.kt:16:14:18:5 | funInInterface |

java/ql/test-kotlin2/library-tests/comments/comments.expected

@@ -93,7 +93,7 @@ dc.kt:
 #    0|                 0: [BooleanLiteral] false
 #    0|         2: [LocalVariableDeclStmt] var ...;
 #    0|           1: [LocalVariableDeclExpr] tmp0_other_with_cast
-#    0|             0: [CastExpr] (...)...
+#    0|             0: [ImplicitCastExpr] <implicit cast>
 #    0|               0: [TypeAccess] ProtoMapValue
 #    0|               1: [VarAccess] other
 #    0|         3: [ExprStmt] <Expr>;