diff --git a/java/ql/test/kotlin/library-tests/annotation_classes/classes.expected b/java/ql/test/kotlin/library-tests/annotation_classes/classes.expected
index 01f5581b73a..94b71230531 100644
--- a/java/ql/test/kotlin/library-tests/annotation_classes/classes.expected
+++ b/java/ql/test/kotlin/library-tests/annotation_classes/classes.expected
@@ -1,3 +1,14 @@
+#select
+| Annot0j.java:1:19:1:25 | Annot0j | Interface |
+| Annot1j.java:1:19:1:25 | Annot1j | Interface |
+| def.kt:0:0:0:0 | DefKt | Class |
+| def.kt:5:1:21:60 | Annot0k | Interface |
+| def.kt:23:1:31:1 | Annot1k | Interface |
+| def.kt:33:1:33:10 | X | Class |
+| def.kt:34:1:36:1 | Y | Class |
+| def.kt:38:1:43:1 | Z | Class |
+| use.java:1:14:1:16 | use | Class |
+| use.java:14:18:14:18 | Z | Class |
 annotationDeclarations
 | Annot0j.java:1:19:1:25 | Annot0j | Annot0j.java:2:9:2:11 | abc |
 | Annot1j.java:1:19:1:25 | Annot1j | Annot1j.java:2:9:2:9 | a |
@@ -69,14 +80,3 @@ annotationValues
 | use.java:13:5:13:88 | Annot1k | use.java:13:57:13:66 | {...} |
 | use.java:13:5:13:88 | Annot1k | use.java:13:73:13:87 | Annot0k |
 | use.java:13:73:13:87 | Annot0k | use.java:13:86:13:86 | 2 |
-#select
-| Annot0j.java:1:19:1:25 | Annot0j | Interface |
-| Annot1j.java:1:19:1:25 | Annot1j | Interface |
-| def.kt:0:0:0:0 | DefKt | Class |
-| def.kt:5:1:21:60 | Annot0k | Interface |
-| def.kt:23:1:31:1 | Annot1k | Interface |
-| def.kt:33:1:33:10 | X | Class |
-| def.kt:34:1:36:1 | Y | Class |
-| def.kt:38:1:43:1 | Z | Class |
-| use.java:1:14:1:16 | use | Class |
-| use.java:14:18:14:18 | Z | Class |
diff --git a/java/ql/test/kotlin/library-tests/arrays/test.expected b/java/ql/test/kotlin/library-tests/arrays/test.expected
index 7693b3acd6b..efdc5179609 100644
--- a/java/ql/test/kotlin/library-tests/arrays/test.expected
+++ b/java/ql/test/kotlin/library-tests/arrays/test.expected
@@ -1,3 +1,10 @@
+#select
+| primitiveArrays.kt:5:12:5:24 | a | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
+| primitiveArrays.kt:5:27:5:40 | b | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
+| primitiveArrays.kt:5:43:5:53 | c | file://:0:0:0:0 | int[] | int | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
+| primitiveArrays.kt:5:56:5:76 | d | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
+| primitiveArrays.kt:5:79:5:98 | e | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
+| primitiveArrays.kt:5:101:5:118 | f | file://:0:0:0:0 | int[][] | int[] | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
 cloneMethods
 | file://:0:0:0:0 | clone | clone() | file://:0:0:0:0 | Integer[] | file://:0:0:0:0 | Integer[] | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
 | file://:0:0:0:0 | clone | clone() | file://:0:0:0:0 | Integer[][] | file://:0:0:0:0 | Integer[][] | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
@@ -21,10 +28,3 @@ sourceSignatures
 | arrayIterators.kt:1:1:13:1 | test | test(java.lang.Integer[],int[],boolean[]) |
 | primitiveArrays.kt:3:1:7:1 | Test | Test() |
 | primitiveArrays.kt:5:3:5:123 | test | test(java.lang.Integer[],java.lang.Integer[],int[],java.lang.Integer[][],java.lang.Integer[][],int[][]) |
-#select
-| primitiveArrays.kt:5:12:5:24 | a | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
-| primitiveArrays.kt:5:27:5:40 | b | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
-| primitiveArrays.kt:5:43:5:53 | c | file://:0:0:0:0 | int[] | int | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
-| primitiveArrays.kt:5:56:5:76 | d | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
-| primitiveArrays.kt:5:79:5:98 | e | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
-| primitiveArrays.kt:5:101:5:118 | f | file://:0:0:0:0 | int[][] | int[] | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.expected b/java/ql/test/kotlin/library-tests/classes/superTypes.expected
index 31b8979e0b3..57b683230dd 100644
--- a/java/ql/test/kotlin/library-tests/classes/superTypes.expected
+++ b/java/ql/test/kotlin/library-tests/classes/superTypes.expected
@@ -1,3 +1,96 @@
+#select
+| classes.kt:2:1:2:18 | ClassOne | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:4:1:6:1 | ClassTwo | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:8:1:10:1 | ClassThree | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:12:1:15:1 | ClassFour | classes.kt:8:1:10:1 | ClassThree |
+| classes.kt:17:1:18:1 | ClassFive | classes.kt:12:1:15:1 | ClassFour |
+| classes.kt:28:1:30:1 | ClassSix | classes.kt:12:1:15:1 | ClassFour |
+| classes.kt:28:1:30:1 | ClassSix | classes.kt:20:1:22:1 | IF1 |
+| classes.kt:28:1:30:1 | ClassSix | classes.kt:24:1:26:1 | IF2 |
+| classes.kt:34:1:47:1 | ClassSeven | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:49:1:51:1 | Direction | file://<external>/Enum.class:0:0:0:0 | Enum<Direction> |
+| classes.kt:53:1:57:1 | Color | file://<external>/Enum.class:0:0:0:0 | Enum<Color> |
+| classes.kt:63:1:91:1 | Class1 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
+| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
+| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
+| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
+| classes.kt:68:20:68:74 | new Object(...) { ... } | file://<external>/Interface3.class:0:0:0:0 | Interface3<String> |
+| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
+| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
+| classes.kt:75:24:75:33 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
+| classes.kt:85:16:85:25 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | file://<external>/Interface3.class:0:0:0:0 | Interface3<Integer> |
+| classes.kt:93:1:93:26 | pulicClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:94:1:94:29 | privateClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:95:1:95:31 | internalClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:96:1:96:34 | noExplicitVisibilityClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:98:1:104:1 | nestedClassVisibilities | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:99:5:99:36 | pulicNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:100:5:100:43 | protectedNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:101:5:101:39 | privateNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:102:5:102:41 | internalNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:103:5:103:44 | noExplicitVisibilityNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:106:1:106:27 | sealedClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:107:1:107:23 | openClass | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:109:1:136:1 | C1 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:111:9:113:9 | Local1 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:118:9:123:9 |  | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:119:13:121:13 | Local2 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:127:16:134:9 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:129:17:131:17 | Local3 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:138:1:148:1 | Cl0 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:140:9:146:9 |  | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:141:13:145:13 | Cl1 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:150:1:156:1 | Cl00 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:151:5:155:5 | Cl01 | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:159:5:159:14 | X | file://<external>/Object.class:0:0:0:0 | Object |
+| classes.kt:162:13:162:22 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/C1$<no name provided>$Local3.class:0:0:0:0 | Local3<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/C1$Local1.class:0:0:0:0 | Local1<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/C1$Local2.class:0:0:0:0 | Local2<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/Generic.class:0:0:0:0 | Generic<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/Generic.class:0:0:0:0 | Generic<Integer> | generic_anonymous.kt:1:1:9:1 | Generic<> |
+| file://<external>/Generic.class:0:0:0:0 | Generic<String> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/Generic.class:0:0:0:0 | Generic<String> | generic_anonymous.kt:1:1:9:1 | Generic<> |
+| file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T3,String> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T5,String> | file://<external>/Object.class:0:0:0:0 | Object |
+| file://<external>/SuperChain2.class:0:0:0:0 | SuperChain2<T5,String> | file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T5,String> |
+| generic_anonymous.kt:1:1:9:1 | Generic | file://<external>/Object.class:0:0:0:0 | Object |
+| generic_anonymous.kt:1:1:9:1 | Generic | generic_anonymous.kt:1:1:9:1 | Generic<> |
+| generic_anonymous.kt:1:1:9:1 | Generic<> | file://<external>/Object.class:0:0:0:0 | Object |
+| generic_anonymous.kt:3:19:5:3 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| generic_anonymous.kt:3:19:5:3 | new Object(...) { ... }<> | file://<external>/Object.class:0:0:0:0 | Object |
+| generic_anonymous.kt:15:1:33:1 | Outer | file://<external>/Object.class:0:0:0:0 | Object |
+| generic_anonymous.kt:25:9:31:9 |  | file://<external>/Object.class:0:0:0:0 | Object |
+| generic_anonymous.kt:26:13:26:37 | new Object(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
+| generic_anonymous.kt:26:13:26:37 | new Object(...) { ... } | file://<external>/Outer$C1.class:0:0:0:0 | C1<U3> |
+| generic_anonymous.kt:27:13:27:37 | new Object(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
+| generic_anonymous.kt:27:13:27:37 | new Object(...) { ... } | file://<external>/Outer$C1.class:0:0:0:0 | C1<U2> |
+| generic_anonymous.kt:28:13:28:41 | new Object(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
+| generic_anonymous.kt:28:13:28:41 | new Object(...) { ... } | file://<external>/Outer$C1.class:0:0:0:0 | C1<String> |
+| generic_anonymous.kt:29:13:29:29 | new C0<U2>(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
+| generic_anonymous.kt:30:13:30:33 | new C0<String>(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<String> |
+| localClassField.kt:1:1:11:1 | A | file://<external>/Object.class:0:0:0:0 | Object |
+| localClassField.kt:3:9:3:19 | L | file://<external>/Object.class:0:0:0:0 | Object |
+| localClassField.kt:8:9:8:19 | L | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:3:1:36:1 | Class1 | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:5:16:7:9 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:11:9:11:24 |  | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:16:23:16:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Function2.class:0:0:0:0 | Function2<Integer,Integer,Integer> |
+| local_anonymous.kt:16:23:16:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:17:23:17:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Function2.class:0:0:0:0 | Function2<Integer,Integer,Integer> |
+| local_anonymous.kt:17:23:17:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:21:21:21:31 | new Function1<Class1,Unit>(...) { ... } | file://<external>/Function1.class:0:0:0:0 | Function1<Class1,Unit> |
+| local_anonymous.kt:21:21:21:31 | new Function1<Class1,Unit>(...) { ... } | file://<external>/FunctionReference.class:0:0:0:0 | FunctionReference |
+| local_anonymous.kt:25:9:25:27 | LocalClass | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:29:31:35:5 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:39:1:45:1 | Class2 | file://<external>/Object.class:0:0:0:0 | Object |
+| local_anonymous.kt:40:14:44:5 | new Interface2(...) { ... } | local_anonymous.kt:38:1:38:23 | Interface2 |
+| superChain.kt:1:1:1:33 | SuperChain1 | file://<external>/Object.class:0:0:0:0 | Object |
+| superChain.kt:2:1:2:60 | SuperChain2 | file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T3,String> |
+| superChain.kt:3:1:3:60 | SuperChain3 | file://<external>/SuperChain2.class:0:0:0:0 | SuperChain2<T5,String> |
 extendsOrImplements
 | classes.kt:2:1:2:18 | ClassOne | file://<external>/Object.class:0:0:0:0 | Object | extends |
 | classes.kt:4:1:6:1 | ClassTwo | file://<external>/Object.class:0:0:0:0 | Object | extends |
@@ -103,96 +196,3 @@ extendsOrImplements
 | superChain.kt:1:1:1:33 | SuperChain1 | file://<external>/Object.class:0:0:0:0 | Object | extends |
 | superChain.kt:2:1:2:60 | SuperChain2 | file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T3,String> | extends |
 | superChain.kt:3:1:3:60 | SuperChain3 | file://<external>/SuperChain2.class:0:0:0:0 | SuperChain2<T5,String> | extends |
-#select
-| classes.kt:2:1:2:18 | ClassOne | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:4:1:6:1 | ClassTwo | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:8:1:10:1 | ClassThree | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:12:1:15:1 | ClassFour | classes.kt:8:1:10:1 | ClassThree |
-| classes.kt:17:1:18:1 | ClassFive | classes.kt:12:1:15:1 | ClassFour |
-| classes.kt:28:1:30:1 | ClassSix | classes.kt:12:1:15:1 | ClassFour |
-| classes.kt:28:1:30:1 | ClassSix | classes.kt:20:1:22:1 | IF1 |
-| classes.kt:28:1:30:1 | ClassSix | classes.kt:24:1:26:1 | IF2 |
-| classes.kt:34:1:47:1 | ClassSeven | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:49:1:51:1 | Direction | file://<external>/Enum.class:0:0:0:0 | Enum<Direction> |
-| classes.kt:53:1:57:1 | Color | file://<external>/Enum.class:0:0:0:0 | Enum<Color> |
-| classes.kt:63:1:91:1 | Class1 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
-| classes.kt:66:20:66:54 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
-| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
-| classes.kt:68:20:68:74 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
-| classes.kt:68:20:68:74 | new Object(...) { ... } | file://<external>/Interface3.class:0:0:0:0 | Interface3<String> |
-| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
-| classes.kt:72:16:77:10 | new Object(...) { ... } | classes.kt:60:1:60:23 | Interface2 |
-| classes.kt:75:24:75:33 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:81:16:81:38 | new Interface1(...) { ... } | classes.kt:59:1:59:23 | Interface1 |
-| classes.kt:85:16:85:25 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:89:16:89:44 | new Interface3<Integer>(...) { ... } | file://<external>/Interface3.class:0:0:0:0 | Interface3<Integer> |
-| classes.kt:93:1:93:26 | pulicClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:94:1:94:29 | privateClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:95:1:95:31 | internalClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:96:1:96:34 | noExplicitVisibilityClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:98:1:104:1 | nestedClassVisibilities | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:99:5:99:36 | pulicNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:100:5:100:43 | protectedNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:101:5:101:39 | privateNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:102:5:102:41 | internalNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:103:5:103:44 | noExplicitVisibilityNestedClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:106:1:106:27 | sealedClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:107:1:107:23 | openClass | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:109:1:136:1 | C1 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:111:9:113:9 | Local1 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:118:9:123:9 |  | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:119:13:121:13 | Local2 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:127:16:134:9 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:129:17:131:17 | Local3 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:138:1:148:1 | Cl0 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:140:9:146:9 |  | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:141:13:145:13 | Cl1 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:150:1:156:1 | Cl00 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:151:5:155:5 | Cl01 | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:159:5:159:14 | X | file://<external>/Object.class:0:0:0:0 | Object |
-| classes.kt:162:13:162:22 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/C1$<no name provided>$Local3.class:0:0:0:0 | Local3<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/C1$Local1.class:0:0:0:0 | Local1<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/C1$Local2.class:0:0:0:0 | Local2<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/Generic.class:0:0:0:0 | Generic<Integer> | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/Generic.class:0:0:0:0 | Generic<Integer> | generic_anonymous.kt:1:1:9:1 | Generic<> |
-| file://<external>/Generic.class:0:0:0:0 | Generic<String> | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/Generic.class:0:0:0:0 | Generic<String> | generic_anonymous.kt:1:1:9:1 | Generic<> |
-| file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T3,String> | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T5,String> | file://<external>/Object.class:0:0:0:0 | Object |
-| file://<external>/SuperChain2.class:0:0:0:0 | SuperChain2<T5,String> | file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T5,String> |
-| generic_anonymous.kt:1:1:9:1 | Generic | file://<external>/Object.class:0:0:0:0 | Object |
-| generic_anonymous.kt:1:1:9:1 | Generic | generic_anonymous.kt:1:1:9:1 | Generic<> |
-| generic_anonymous.kt:1:1:9:1 | Generic<> | file://<external>/Object.class:0:0:0:0 | Object |
-| generic_anonymous.kt:3:19:5:3 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| generic_anonymous.kt:3:19:5:3 | new Object(...) { ... }<> | file://<external>/Object.class:0:0:0:0 | Object |
-| generic_anonymous.kt:15:1:33:1 | Outer | file://<external>/Object.class:0:0:0:0 | Object |
-| generic_anonymous.kt:25:9:31:9 |  | file://<external>/Object.class:0:0:0:0 | Object |
-| generic_anonymous.kt:26:13:26:37 | new Object(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
-| generic_anonymous.kt:26:13:26:37 | new Object(...) { ... } | file://<external>/Outer$C1.class:0:0:0:0 | C1<U3> |
-| generic_anonymous.kt:27:13:27:37 | new Object(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
-| generic_anonymous.kt:27:13:27:37 | new Object(...) { ... } | file://<external>/Outer$C1.class:0:0:0:0 | C1<U2> |
-| generic_anonymous.kt:28:13:28:41 | new Object(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
-| generic_anonymous.kt:28:13:28:41 | new Object(...) { ... } | file://<external>/Outer$C1.class:0:0:0:0 | C1<String> |
-| generic_anonymous.kt:29:13:29:29 | new C0<U2>(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<U2> |
-| generic_anonymous.kt:30:13:30:33 | new C0<String>(...) { ... } | file://<external>/Outer$C0.class:0:0:0:0 | C0<String> |
-| localClassField.kt:1:1:11:1 | A | file://<external>/Object.class:0:0:0:0 | Object |
-| localClassField.kt:3:9:3:19 | L | file://<external>/Object.class:0:0:0:0 | Object |
-| localClassField.kt:8:9:8:19 | L | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:3:1:36:1 | Class1 | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:5:16:7:9 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:11:9:11:24 |  | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:16:23:16:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Function2.class:0:0:0:0 | Function2<Integer,Integer,Integer> |
-| local_anonymous.kt:16:23:16:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:17:23:17:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Function2.class:0:0:0:0 | Function2<Integer,Integer,Integer> |
-| local_anonymous.kt:17:23:17:49 | new Function2<Integer,Integer,Integer>(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:21:21:21:31 | new Function1<Class1,Unit>(...) { ... } | file://<external>/Function1.class:0:0:0:0 | Function1<Class1,Unit> |
-| local_anonymous.kt:21:21:21:31 | new Function1<Class1,Unit>(...) { ... } | file://<external>/FunctionReference.class:0:0:0:0 | FunctionReference |
-| local_anonymous.kt:25:9:25:27 | LocalClass | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:29:31:35:5 | new Object(...) { ... } | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:39:1:45:1 | Class2 | file://<external>/Object.class:0:0:0:0 | Object |
-| local_anonymous.kt:40:14:44:5 | new Interface2(...) { ... } | local_anonymous.kt:38:1:38:23 | Interface2 |
-| superChain.kt:1:1:1:33 | SuperChain1 | file://<external>/Object.class:0:0:0:0 | Object |
-| superChain.kt:2:1:2:60 | SuperChain2 | file://<external>/SuperChain1.class:0:0:0:0 | SuperChain1<T3,String> |
-| superChain.kt:3:1:3:60 | SuperChain3 | file://<external>/SuperChain2.class:0:0:0:0 | SuperChain2<T5,String> |
diff --git a/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected b/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
index 36544bd2d93..993e707744e 100644
--- a/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
+++ b/java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected
@@ -1,4 +1,3 @@
-missingSuccessor
 #select
 | Test.kt:0:0:0:0 | TestKt | Class | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:3:1:80:1 | Test | Class | file://:0:0:0:0 | <none> | <none> |
@@ -259,3 +258,4 @@ missingSuccessor
 | Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:118:1:124:1 | fn_when | Method |
 | Test.kt:122:12:122:16 | true | BooleanLiteral | Test.kt:122:12:122:16 | <Expr>; | ExprStmt |
 | Test.kt:123:8:123:10 | { ... } | BlockStmt | Test.kt:118:1:124:1 | fn_when | Method |
+missingSuccessor
diff --git a/java/ql/test/kotlin/library-tests/enum/test.expected b/java/ql/test/kotlin/library-tests/enum/test.expected
index 2484ff2e2ba..b8be8ed4152 100644
--- a/java/ql/test/kotlin/library-tests/enum/test.expected
+++ b/java/ql/test/kotlin/library-tests/enum/test.expected
@@ -1,7 +1,3 @@
-enumConstants
-| enumUser.kt:3:16:3:17 | A |
-| enumUser.kt:3:19:3:20 | B |
-| enumUser.kt:3:22:3:22 | C |
 #select
 | addAll |
 | addRange |
@@ -35,3 +31,7 @@ enumConstants
 | usesEnum |
 | valueOf |
 | writeReplace |
+enumConstants
+| enumUser.kt:3:16:3:17 | A |
+| enumUser.kt:3:19:3:20 | B |
+| enumUser.kt:3:22:3:22 | C |
diff --git a/java/ql/test/kotlin/library-tests/extensions/parameters.expected b/java/ql/test/kotlin/library-tests/extensions/parameters.expected
index 65906e57dd2..dfbf92eb4f9 100644
--- a/java/ql/test/kotlin/library-tests/extensions/parameters.expected
+++ b/java/ql/test/kotlin/library-tests/extensions/parameters.expected
@@ -1,3 +1,22 @@
+#select
+| extensions.kt:3:5:3:38 | someClassMethod | extensions.kt:3:25:3:34 | p1 | 0 |
+| extensions.kt:6:5:6:41 | anotherClassMethod | extensions.kt:6:28:6:37 | p1 | 0 |
+| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:5:9:13 | <this> | 0 |
+| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:23:9:32 | p1 | 1 |
+| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:5:10:16 | <this> | 0 |
+| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:29:10:38 | p1 | 1 |
+| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:5:12:13 | <this> | 0 |
+| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:23:12:32 | p1 | 1 |
+| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:5:13:16 | <this> | 0 |
+| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:26:13:35 | p1 | 1 |
+| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:5:15:13 | <this> | 0 |
+| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:32:15:38 | p1 | 1 |
+| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:5:16:16 | <this> | 0 |
+| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:35:16:44 | p1 | 1 |
+| extensions.kt:18:1:18:51 | bar | extensions.kt:18:5:18:10 | <this> | 0 |
+| extensions.kt:18:1:18:51 | bar | extensions.kt:18:16:18:25 | p1 | 1 |
+| extensions.kt:30:5:30:55 | baz | extensions.kt:30:9:30:14 | <this> | 0 |
+| extensions.kt:30:5:30:55 | baz | extensions.kt:30:20:30:29 | p1 | 1 |
 parametersWithArgs
 | extensions.kt:3:25:3:34 | p1 | 0 | extensions.kt:21:34:21:36 | "foo" |
 | extensions.kt:6:28:6:37 | p1 | 0 | extensions.kt:25:40:25:42 | "foo" |
@@ -28,22 +47,3 @@ extensionParameter
 | extensions.kt:16:5:16:16 | <this> |
 | extensions.kt:18:5:18:10 | <this> |
 | extensions.kt:30:9:30:14 | <this> |
-#select
-| extensions.kt:3:5:3:38 | someClassMethod | extensions.kt:3:25:3:34 | p1 | 0 |
-| extensions.kt:6:5:6:41 | anotherClassMethod | extensions.kt:6:28:6:37 | p1 | 0 |
-| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:5:9:13 | <this> | 0 |
-| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:23:9:32 | p1 | 1 |
-| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:5:10:16 | <this> | 0 |
-| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:29:10:38 | p1 | 1 |
-| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:5:12:13 | <this> | 0 |
-| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:23:12:32 | p1 | 1 |
-| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:5:13:16 | <this> | 0 |
-| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:26:13:35 | p1 | 1 |
-| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:5:15:13 | <this> | 0 |
-| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:32:15:38 | p1 | 1 |
-| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:5:16:16 | <this> | 0 |
-| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:35:16:44 | p1 | 1 |
-| extensions.kt:18:1:18:51 | bar | extensions.kt:18:5:18:10 | <this> | 0 |
-| extensions.kt:18:1:18:51 | bar | extensions.kt:18:16:18:25 | p1 | 1 |
-| extensions.kt:30:5:30:55 | baz | extensions.kt:30:9:30:14 | <this> | 0 |
-| extensions.kt:30:5:30:55 | baz | extensions.kt:30:20:30:29 | p1 | 1 |
diff --git a/java/ql/test/kotlin/library-tests/field-initializer-flow/test.expected b/java/ql/test/kotlin/library-tests/field-initializer-flow/test.expected
index a959250456f..5c6353b87c9 100644
--- a/java/ql/test/kotlin/library-tests/field-initializer-flow/test.expected
+++ b/java/ql/test/kotlin/library-tests/field-initializer-flow/test.expected
@@ -1,3 +1,3 @@
 isFinalField
 | test.kt:3:3:3:18 | x |
-#select
\ No newline at end of file
+#select
diff --git a/java/ql/test/kotlin/library-tests/java-map-methods/test.expected b/java/ql/test/kotlin/library-tests/java-map-methods/test.expected
index 66fb9f6ea55..813df1c237a 100644
--- a/java/ql/test/kotlin/library-tests/java-map-methods/test.expected
+++ b/java/ql/test/kotlin/library-tests/java-map-methods/test.expected
@@ -1,7 +1,7 @@
-diagnostics
-| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Number.toChar in java.lang.Number |
 #select
 | Integer |
 | Iterable<? extends T> |
 | Object |
 | int |
+diagnostics
+| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Number.toChar in java.lang.Number |
diff --git a/java/ql/test/kotlin/library-tests/java_and_kotlin/test.expected b/java/ql/test/kotlin/library-tests/java_and_kotlin/test.expected
index fa37843355f..3ae886713c3 100644
--- a/java/ql/test/kotlin/library-tests/java_and_kotlin/test.expected
+++ b/java/ql/test/kotlin/library-tests/java_and_kotlin/test.expected
@@ -1,3 +1,8 @@
+#select
+| Java.java:5:3:5:26 | kotlinFun(...) | Kotlin.kt:2:2:4:2 | kotlinFun |
+| Java.java:11:11:11:22 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
+| Kotlin.kt:13:40:13:51 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
+| Kotlin.kt:14:48:14:59 | fn1(...) | Kotlin.kt:9:18:9:46 | fn1 |
 methods
 | Java.java:4:7:4:13 | javaFun | javaFun() |
 | Java.java:10:17:10:19 | fn0 | fn0(int) |
@@ -12,8 +17,3 @@ overrides
 | Kotlin.kt:14:22:14:59 | fn1 | Kotlin.kt:9:18:9:46 | fn1 |
 signature_mismatch
 | Kotlin.kt:9:18:9:46 | fn1 | fn1(int) |
-#select
-| Java.java:5:3:5:26 | kotlinFun(...) | Kotlin.kt:2:2:4:2 | kotlinFun |
-| Java.java:11:11:11:22 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
-| Kotlin.kt:13:40:13:51 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
-| Kotlin.kt:14:48:14:59 | fn1(...) | Kotlin.kt:9:18:9:46 | fn1 |
diff --git a/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/visibility.expected b/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/visibility.expected
index 378da6dd22f..43e5e8eefbe 100644
--- a/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/visibility.expected
+++ b/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/visibility.expected
@@ -1,3 +1,9 @@
+#select
+| Kotlin.kt:2:11:3:2 | kotlinFun$main | final |
+| Kotlin.kt:2:11:3:2 | kotlinFun$main | internal |
+| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | final |
+| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | internal |
+| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | static |
 isPublic
 isInternal
 | Kotlin.kt:2:11:3:2 | kotlinFun$main |
@@ -8,9 +14,3 @@ modifiers_methods
 | file://:0:0:0:0 | internal | Kotlin.kt:2:11:3:2 | kotlinFun$main |
 | file://:0:0:0:0 | internal | Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
 | file://:0:0:0:0 | static | Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
-#select
-| Kotlin.kt:2:11:3:2 | kotlinFun$main | final |
-| Kotlin.kt:2:11:3:2 | kotlinFun$main | internal |
-| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | final |
-| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | internal |
-| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | static |
diff --git a/java/ql/test/kotlin/library-tests/private-anonymous-types/test.expected b/java/ql/test/kotlin/library-tests/private-anonymous-types/test.expected
index 40de73eadd9..766185e4931 100644
--- a/java/ql/test/kotlin/library-tests/private-anonymous-types/test.expected
+++ b/java/ql/test/kotlin/library-tests/private-anonymous-types/test.expected
@@ -1,9 +1,3 @@
-enclosingTypes
-| file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 | new If<T>(...) { ... }<> | file:///!unknown-binary-location/A.class:0:0:0:0 | A<CharSequence> |
-| file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 | new If<T>(...) { ... }<> | file:///!unknown-binary-location/A.class:0:0:0:0 | A<String> |
-| test.kt:9:18:11:3 | new If<T>(...) { ... } | test.kt:7:1:22:1 | A |
-| test.kt:13:33:15:3 | new If<T>(...) { ... } | test.kt:7:1:22:1 | A |
-| test.kt:13:33:15:3 | new If<T>(...) { ... }<> | test.kt:7:1:22:1 | A<> |
 #select
 | file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 | new If<T>(...) { ... }<> | file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 |  |
 | file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 | new If<T>(...) { ... }<> | file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 |  |
@@ -34,3 +28,9 @@ enclosingTypes
 | test.kt:13:33:15:3 | new If<T>(...) { ... } | test.kt:13:33:15:3 |  |
 | test.kt:13:33:15:3 | new If<T>(...) { ... } | test.kt:14:5:14:22 | x |
 | test.kt:13:33:15:3 | new If<T>(...) { ... } | test.kt:14:14:14:22 | getX |
+enclosingTypes
+| file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 | new If<T>(...) { ... }<> | file:///!unknown-binary-location/A.class:0:0:0:0 | A<CharSequence> |
+| file:///!unknown-binary-location/A$<no name provided>.class:0:0:0:0 | new If<T>(...) { ... }<> | file:///!unknown-binary-location/A.class:0:0:0:0 | A<String> |
+| test.kt:9:18:11:3 | new If<T>(...) { ... } | test.kt:7:1:22:1 | A |
+| test.kt:13:33:15:3 | new If<T>(...) { ... } | test.kt:7:1:22:1 | A |
+| test.kt:13:33:15:3 | new If<T>(...) { ... }<> | test.kt:7:1:22:1 | A<> |
diff --git a/java/ql/test/kotlin/library-tests/properties/properties.expected b/java/ql/test/kotlin/library-tests/properties/properties.expected
index 01c82187a81..1f60e9054b2 100644
--- a/java/ql/test/kotlin/library-tests/properties/properties.expected
+++ b/java/ql/test/kotlin/library-tests/properties/properties.expected
@@ -1,27 +1,3 @@
-fieldDeclarations
-| properties.kt:2:27:2:50 | int constructorProp; | properties.kt:2:27:2:50 | constructorProp | 0 |
-| properties.kt:2:53:2:83 | int mutableConstructorProp; | properties.kt:2:53:2:83 | mutableConstructorProp | 0 |
-| properties.kt:3:5:3:25 | int modifiableInt; | properties.kt:3:5:3:25 | modifiableInt | 0 |
-| properties.kt:4:5:4:24 | int immutableInt; | properties.kt:4:5:4:24 | immutableInt | 0 |
-| properties.kt:5:5:5:26 | int typedProp; | properties.kt:5:5:5:26 | typedProp | 0 |
-| properties.kt:7:5:7:30 | int initialisedInInit; | properties.kt:7:5:7:30 | initialisedInInit | 0 |
-| properties.kt:11:5:11:40 | int useConstructorArg; | properties.kt:11:5:11:40 | useConstructorArg | 0 |
-| properties.kt:19:5:20:15 | int defaultGetter; | properties.kt:19:5:20:15 | defaultGetter | 0 |
-| properties.kt:21:5:22:15 | int varDefaultGetter; | properties.kt:21:5:22:15 | varDefaultGetter | 0 |
-| properties.kt:23:5:24:15 | int varDefaultSetter; | properties.kt:23:5:24:15 | varDefaultSetter | 0 |
-| properties.kt:25:5:27:15 | int varDefaultGetterSetter; | properties.kt:25:5:27:15 | varDefaultGetterSetter | 0 |
-| properties.kt:28:5:29:22 | int overrideGetter; | properties.kt:28:5:29:22 | overrideGetter | 0 |
-| properties.kt:30:5:31:29 | int overrideGetterUseField; | properties.kt:30:5:31:29 | overrideGetterUseField | 0 |
-| properties.kt:32:5:33:29 | int useField; | properties.kt:32:5:33:29 | useField | 0 |
-| properties.kt:34:5:34:36 | String lateInitVar; | properties.kt:34:5:34:36 | lateInitVar | 0 |
-| properties.kt:35:5:35:32 | int privateProp; | properties.kt:35:5:35:32 | privateProp | 0 |
-| properties.kt:36:5:36:36 | int protectedProp; | properties.kt:36:5:36:36 | protectedProp | 0 |
-| properties.kt:37:5:37:30 | int publicProp; | properties.kt:37:5:37:30 | publicProp | 0 |
-| properties.kt:38:5:38:34 | int internalProp; | properties.kt:38:5:38:34 | internalProp | 0 |
-| properties.kt:67:1:67:23 | int constVal; | properties.kt:67:1:67:23 | constVal | 0 |
-| properties.kt:70:5:70:16 | int prop; | properties.kt:70:5:70:16 | prop | 0 |
-| properties.kt:84:5:84:29 | int data; | properties.kt:84:5:84:29 | data | 0 |
-| properties.kt:92:5:93:18 | int data; | properties.kt:92:5:93:18 | data | 0 |
 #select
 | properties.kt:2:27:2:50 | constructorProp | properties.kt:2:27:2:50 | getConstructorProp | file://:0:0:0:0 | <none> | properties.kt:2:27:2:50 | constructorProp | public |
 | properties.kt:2:53:2:83 | mutableConstructorProp | properties.kt:2:53:2:83 | getMutableConstructorProp | properties.kt:2:53:2:83 | setMutableConstructorProp | properties.kt:2:53:2:83 | mutableConstructorProp | public |
@@ -52,3 +28,27 @@ fieldDeclarations
 | properties.kt:80:1:81:13 | x | properties.kt:81:5:81:13 | getX | file://:0:0:0:0 | <none> | file://:0:0:0:0 | <none> | public |
 | properties.kt:84:5:84:29 | data | properties.kt:84:13:84:29 | getData$private | properties.kt:84:13:84:29 | setData$private | properties.kt:84:5:84:29 | data | private |
 | properties.kt:92:5:93:18 | data | properties.kt:93:9:93:18 | getData | properties.kt:92:13:93:18 | setData$private | properties.kt:92:5:93:18 | data | private |
+fieldDeclarations
+| properties.kt:2:27:2:50 | int constructorProp; | properties.kt:2:27:2:50 | constructorProp | 0 |
+| properties.kt:2:53:2:83 | int mutableConstructorProp; | properties.kt:2:53:2:83 | mutableConstructorProp | 0 |
+| properties.kt:3:5:3:25 | int modifiableInt; | properties.kt:3:5:3:25 | modifiableInt | 0 |
+| properties.kt:4:5:4:24 | int immutableInt; | properties.kt:4:5:4:24 | immutableInt | 0 |
+| properties.kt:5:5:5:26 | int typedProp; | properties.kt:5:5:5:26 | typedProp | 0 |
+| properties.kt:7:5:7:30 | int initialisedInInit; | properties.kt:7:5:7:30 | initialisedInInit | 0 |
+| properties.kt:11:5:11:40 | int useConstructorArg; | properties.kt:11:5:11:40 | useConstructorArg | 0 |
+| properties.kt:19:5:20:15 | int defaultGetter; | properties.kt:19:5:20:15 | defaultGetter | 0 |
+| properties.kt:21:5:22:15 | int varDefaultGetter; | properties.kt:21:5:22:15 | varDefaultGetter | 0 |
+| properties.kt:23:5:24:15 | int varDefaultSetter; | properties.kt:23:5:24:15 | varDefaultSetter | 0 |
+| properties.kt:25:5:27:15 | int varDefaultGetterSetter; | properties.kt:25:5:27:15 | varDefaultGetterSetter | 0 |
+| properties.kt:28:5:29:22 | int overrideGetter; | properties.kt:28:5:29:22 | overrideGetter | 0 |
+| properties.kt:30:5:31:29 | int overrideGetterUseField; | properties.kt:30:5:31:29 | overrideGetterUseField | 0 |
+| properties.kt:32:5:33:29 | int useField; | properties.kt:32:5:33:29 | useField | 0 |
+| properties.kt:34:5:34:36 | String lateInitVar; | properties.kt:34:5:34:36 | lateInitVar | 0 |
+| properties.kt:35:5:35:32 | int privateProp; | properties.kt:35:5:35:32 | privateProp | 0 |
+| properties.kt:36:5:36:36 | int protectedProp; | properties.kt:36:5:36:36 | protectedProp | 0 |
+| properties.kt:37:5:37:30 | int publicProp; | properties.kt:37:5:37:30 | publicProp | 0 |
+| properties.kt:38:5:38:34 | int internalProp; | properties.kt:38:5:38:34 | internalProp | 0 |
+| properties.kt:67:1:67:23 | int constVal; | properties.kt:67:1:67:23 | constVal | 0 |
+| properties.kt:70:5:70:16 | int prop; | properties.kt:70:5:70:16 | prop | 0 |
+| properties.kt:84:5:84:29 | int data; | properties.kt:84:5:84:29 | data | 0 |
+| properties.kt:92:5:93:18 | int data; | properties.kt:92:5:93:18 | data | 0 |
diff --git a/java/ql/test/kotlin/library-tests/special-method-getters/test.expected b/java/ql/test/kotlin/library-tests/special-method-getters/test.expected
index 64b59974fa9..7bdebe05c72 100644
--- a/java/ql/test/kotlin/library-tests/special-method-getters/test.expected
+++ b/java/ql/test/kotlin/library-tests/special-method-getters/test.expected
@@ -1,4 +1,3 @@
-diag
 #select
 | test.kt:1:81:1:89 | length(...) | java.lang.CharSequence | length |
 | test.kt:1:93:1:100 | size(...) | java.util.Collection<String> | size |
@@ -9,3 +8,4 @@ diag
 | test.kt:1:131:1:145 | size(...) | java.util.Collection<String> | size |
 | test.kt:1:149:1:159 | entrySet(...) | java.util.Map<String,String> | entrySet |
 | test.kt:1:149:1:164 | size(...) | java.util.Set<Entry<String,String>> | size |
+diag
diff --git a/java/ql/test/kotlin/library-tests/stmts/stmts.expected b/java/ql/test/kotlin/library-tests/stmts/stmts.expected
index 716bea1649a..a374ed7e222 100644
--- a/java/ql/test/kotlin/library-tests/stmts/stmts.expected
+++ b/java/ql/test/kotlin/library-tests/stmts/stmts.expected
@@ -1,75 +1,3 @@
-enclosing
-| stmts.kt:3:5:6:5 | <Expr>; | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:3:8:4:5 | ... -> ... | stmts.kt:3:5:6:5 | <Expr>; |
-| stmts.kt:3:15:4:5 | { ... } | stmts.kt:3:8:4:5 | ... -> ... |
-| stmts.kt:4:15:5:5 | ... -> ... | stmts.kt:3:5:6:5 | <Expr>; |
-| stmts.kt:4:22:5:5 | { ... } | stmts.kt:4:15:5:5 | ... -> ... |
-| stmts.kt:5:12:6:5 | ... -> ... | stmts.kt:3:5:6:5 | <Expr>; |
-| stmts.kt:5:12:6:5 | { ... } | stmts.kt:5:12:6:5 | ... -> ... |
-| stmts.kt:7:5:8:16 | while (...) | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:8:9:8:16 | return ... | stmts.kt:7:5:8:16 | while (...) |
-| stmts.kt:9:5:11:5 | while (...) | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:9:18:11:5 | { ... } | stmts.kt:9:5:11:5 | while (...) |
-| stmts.kt:10:9:10:16 | return ... | stmts.kt:9:18:11:5 | { ... } |
-| stmts.kt:12:5:14:18 | do ... while (...) | stmts.kt:12:5:14:18 | { ... } |
-| stmts.kt:12:5:14:18 | { ... } | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:12:8:14:5 | { ... } | stmts.kt:12:5:14:18 | do ... while (...) |
-| stmts.kt:13:9:13:16 | return ... | stmts.kt:12:8:14:5 | { ... } |
-| stmts.kt:15:9:15:9 | var ...; | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:17:9:17:10 | var ...; | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:17:26:17:58 | ... -> ... | stmts.kt:17:9:17:10 | var ...; |
-| stmts.kt:17:26:17:58 | ... -> ... | stmts.kt:17:9:17:10 | var ...; |
-| stmts.kt:17:35:17:43 | { ... } | stmts.kt:17:26:17:58 | ... -> ... |
-| stmts.kt:17:37:17:37 | <Expr>; | stmts.kt:17:35:17:43 | { ... } |
-| stmts.kt:17:50:17:58 | { ... } | stmts.kt:17:26:17:58 | ... -> ... |
-| stmts.kt:17:52:17:52 | <Expr>; | stmts.kt:17:50:17:58 | { ... } |
-| stmts.kt:18:9:18:10 | var ...; | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:18:26:18:56 | ... -> ... | stmts.kt:18:9:18:10 | var ...; |
-| stmts.kt:18:26:18:56 | ... -> ... | stmts.kt:18:9:18:10 | var ...; |
-| stmts.kt:18:37:18:37 | <Expr>; | stmts.kt:18:26:18:56 | ... -> ... |
-| stmts.kt:18:52:18:52 | <Expr>; | stmts.kt:18:26:18:56 | ... -> ... |
-| stmts.kt:19:5:19:16 | return ... | stmts.kt:2:41:20:1 | { ... } |
-| stmts.kt:23:11:27:5 | <Label>: ... | stmts.kt:22:27:44:1 | { ... } |
-| stmts.kt:23:11:27:5 | while (...) | stmts.kt:23:11:27:5 | <Label>: ... |
-| stmts.kt:23:27:27:5 | { ... } | stmts.kt:23:11:27:5 | while (...) |
-| stmts.kt:24:9:26:25 | do ... while (...) | stmts.kt:24:9:26:25 | { ... } |
-| stmts.kt:24:9:26:25 | { ... } | stmts.kt:23:27:27:5 | { ... } |
-| stmts.kt:24:13:26:9 | { ... } | stmts.kt:24:9:26:25 | do ... while (...) |
-| stmts.kt:25:13:25:33 | ... -> ... | stmts.kt:25:13:25:33 | <Expr>; |
-| stmts.kt:25:13:25:33 | <Expr>; | stmts.kt:24:13:26:9 | { ... } |
-| stmts.kt:25:24:25:33 | break | stmts.kt:25:13:25:33 | ... -> ... |
-| stmts.kt:28:5:29:16 | while (...) | stmts.kt:22:27:44:1 | { ... } |
-| stmts.kt:29:9:29:16 | continue | stmts.kt:28:5:29:16 | while (...) |
-| stmts.kt:31:5:33:5 | for (... : ...) | stmts.kt:22:27:44:1 | { ... } |
-| stmts.kt:31:21:33:5 | { ... } | stmts.kt:31:5:33:5 | for (... : ...) |
-| stmts.kt:32:9:32:24 | ... -> ... | stmts.kt:32:9:32:24 | <Expr>; |
-| stmts.kt:32:9:32:24 | <Expr>; | stmts.kt:31:21:33:5 | { ... } |
-| stmts.kt:32:20:32:24 | break | stmts.kt:32:9:32:24 | ... -> ... |
-| stmts.kt:35:13:39:5 | <Label>: ... | stmts.kt:22:27:44:1 | { ... } |
-| stmts.kt:35:13:39:5 | for (... : ...) | stmts.kt:35:13:39:5 | <Label>: ... |
-| stmts.kt:35:29:39:5 | { ... } | stmts.kt:35:13:39:5 | for (... : ...) |
-| stmts.kt:36:9:38:25 | do ... while (...) | stmts.kt:36:9:38:25 | { ... } |
-| stmts.kt:36:9:38:25 | { ... } | stmts.kt:35:29:39:5 | { ... } |
-| stmts.kt:36:13:38:9 | { ... } | stmts.kt:36:9:38:25 | do ... while (...) |
-| stmts.kt:37:13:37:36 | ... -> ... | stmts.kt:37:13:37:36 | <Expr>; |
-| stmts.kt:37:13:37:36 | <Expr>; | stmts.kt:36:13:38:9 | { ... } |
-| stmts.kt:37:24:37:36 | break | stmts.kt:37:13:37:36 | ... -> ... |
-| stmts.kt:41:5:43:5 | for (... : ...) | stmts.kt:22:27:44:1 | { ... } |
-| stmts.kt:41:5:43:5 | { ... } | stmts.kt:41:5:43:5 | for (... : ...) |
-| stmts.kt:41:11:41:11 | var ...; | stmts.kt:41:5:43:5 | { ... } |
-| stmts.kt:41:13:41:13 | var ...; | stmts.kt:41:5:43:5 | { ... } |
-| stmts.kt:41:39:43:5 | { ... } | stmts.kt:41:5:43:5 | { ... } |
-| stmts.kt:42:9:42:24 | ... -> ... | stmts.kt:42:9:42:24 | <Expr>; |
-| stmts.kt:42:9:42:24 | <Expr>; | stmts.kt:41:39:43:5 | { ... } |
-| stmts.kt:42:20:42:24 | break | stmts.kt:42:9:42:24 | ... -> ... |
-| stmts.kt:47:5:55:5 | try ... | stmts.kt:46:23:56:1 | { ... } |
-| stmts.kt:47:9:49:5 | { ... } | stmts.kt:47:5:55:5 | try ... |
-| stmts.kt:48:9:48:30 | throw ... | stmts.kt:47:9:49:5 | { ... } |
-| stmts.kt:50:5:52:5 | catch (...) | stmts.kt:47:5:55:5 | try ... |
-| stmts.kt:50:26:52:5 | { ... } | stmts.kt:50:5:52:5 | catch (...) |
-| stmts.kt:51:9:51:16 | return ... | stmts.kt:50:26:52:5 | { ... } |
-| stmts.kt:53:13:55:5 | { ... } | stmts.kt:47:5:55:5 | try ... |
-| stmts.kt:54:9:54:16 | return ... | stmts.kt:53:13:55:5 | { ... } |
 #select
 | stmts.kt:2:41:20:1 | { ... } | BlockStmt |
 | stmts.kt:3:5:6:5 | <Expr>; | ExprStmt |
@@ -145,3 +73,75 @@ enclosing
 | stmts.kt:51:9:51:16 | return ... | ReturnStmt |
 | stmts.kt:53:13:55:5 | { ... } | BlockStmt |
 | stmts.kt:54:9:54:16 | return ... | ReturnStmt |
+enclosing
+| stmts.kt:3:5:6:5 | <Expr>; | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:3:8:4:5 | ... -> ... | stmts.kt:3:5:6:5 | <Expr>; |
+| stmts.kt:3:15:4:5 | { ... } | stmts.kt:3:8:4:5 | ... -> ... |
+| stmts.kt:4:15:5:5 | ... -> ... | stmts.kt:3:5:6:5 | <Expr>; |
+| stmts.kt:4:22:5:5 | { ... } | stmts.kt:4:15:5:5 | ... -> ... |
+| stmts.kt:5:12:6:5 | ... -> ... | stmts.kt:3:5:6:5 | <Expr>; |
+| stmts.kt:5:12:6:5 | { ... } | stmts.kt:5:12:6:5 | ... -> ... |
+| stmts.kt:7:5:8:16 | while (...) | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:8:9:8:16 | return ... | stmts.kt:7:5:8:16 | while (...) |
+| stmts.kt:9:5:11:5 | while (...) | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:9:18:11:5 | { ... } | stmts.kt:9:5:11:5 | while (...) |
+| stmts.kt:10:9:10:16 | return ... | stmts.kt:9:18:11:5 | { ... } |
+| stmts.kt:12:5:14:18 | do ... while (...) | stmts.kt:12:5:14:18 | { ... } |
+| stmts.kt:12:5:14:18 | { ... } | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:12:8:14:5 | { ... } | stmts.kt:12:5:14:18 | do ... while (...) |
+| stmts.kt:13:9:13:16 | return ... | stmts.kt:12:8:14:5 | { ... } |
+| stmts.kt:15:9:15:9 | var ...; | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:17:9:17:10 | var ...; | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:17:26:17:58 | ... -> ... | stmts.kt:17:9:17:10 | var ...; |
+| stmts.kt:17:26:17:58 | ... -> ... | stmts.kt:17:9:17:10 | var ...; |
+| stmts.kt:17:35:17:43 | { ... } | stmts.kt:17:26:17:58 | ... -> ... |
+| stmts.kt:17:37:17:37 | <Expr>; | stmts.kt:17:35:17:43 | { ... } |
+| stmts.kt:17:50:17:58 | { ... } | stmts.kt:17:26:17:58 | ... -> ... |
+| stmts.kt:17:52:17:52 | <Expr>; | stmts.kt:17:50:17:58 | { ... } |
+| stmts.kt:18:9:18:10 | var ...; | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:18:26:18:56 | ... -> ... | stmts.kt:18:9:18:10 | var ...; |
+| stmts.kt:18:26:18:56 | ... -> ... | stmts.kt:18:9:18:10 | var ...; |
+| stmts.kt:18:37:18:37 | <Expr>; | stmts.kt:18:26:18:56 | ... -> ... |
+| stmts.kt:18:52:18:52 | <Expr>; | stmts.kt:18:26:18:56 | ... -> ... |
+| stmts.kt:19:5:19:16 | return ... | stmts.kt:2:41:20:1 | { ... } |
+| stmts.kt:23:11:27:5 | <Label>: ... | stmts.kt:22:27:44:1 | { ... } |
+| stmts.kt:23:11:27:5 | while (...) | stmts.kt:23:11:27:5 | <Label>: ... |
+| stmts.kt:23:27:27:5 | { ... } | stmts.kt:23:11:27:5 | while (...) |
+| stmts.kt:24:9:26:25 | do ... while (...) | stmts.kt:24:9:26:25 | { ... } |
+| stmts.kt:24:9:26:25 | { ... } | stmts.kt:23:27:27:5 | { ... } |
+| stmts.kt:24:13:26:9 | { ... } | stmts.kt:24:9:26:25 | do ... while (...) |
+| stmts.kt:25:13:25:33 | ... -> ... | stmts.kt:25:13:25:33 | <Expr>; |
+| stmts.kt:25:13:25:33 | <Expr>; | stmts.kt:24:13:26:9 | { ... } |
+| stmts.kt:25:24:25:33 | break | stmts.kt:25:13:25:33 | ... -> ... |
+| stmts.kt:28:5:29:16 | while (...) | stmts.kt:22:27:44:1 | { ... } |
+| stmts.kt:29:9:29:16 | continue | stmts.kt:28:5:29:16 | while (...) |
+| stmts.kt:31:5:33:5 | for (... : ...) | stmts.kt:22:27:44:1 | { ... } |
+| stmts.kt:31:21:33:5 | { ... } | stmts.kt:31:5:33:5 | for (... : ...) |
+| stmts.kt:32:9:32:24 | ... -> ... | stmts.kt:32:9:32:24 | <Expr>; |
+| stmts.kt:32:9:32:24 | <Expr>; | stmts.kt:31:21:33:5 | { ... } |
+| stmts.kt:32:20:32:24 | break | stmts.kt:32:9:32:24 | ... -> ... |
+| stmts.kt:35:13:39:5 | <Label>: ... | stmts.kt:22:27:44:1 | { ... } |
+| stmts.kt:35:13:39:5 | for (... : ...) | stmts.kt:35:13:39:5 | <Label>: ... |
+| stmts.kt:35:29:39:5 | { ... } | stmts.kt:35:13:39:5 | for (... : ...) |
+| stmts.kt:36:9:38:25 | do ... while (...) | stmts.kt:36:9:38:25 | { ... } |
+| stmts.kt:36:9:38:25 | { ... } | stmts.kt:35:29:39:5 | { ... } |
+| stmts.kt:36:13:38:9 | { ... } | stmts.kt:36:9:38:25 | do ... while (...) |
+| stmts.kt:37:13:37:36 | ... -> ... | stmts.kt:37:13:37:36 | <Expr>; |
+| stmts.kt:37:13:37:36 | <Expr>; | stmts.kt:36:13:38:9 | { ... } |
+| stmts.kt:37:24:37:36 | break | stmts.kt:37:13:37:36 | ... -> ... |
+| stmts.kt:41:5:43:5 | for (... : ...) | stmts.kt:22:27:44:1 | { ... } |
+| stmts.kt:41:5:43:5 | { ... } | stmts.kt:41:5:43:5 | for (... : ...) |
+| stmts.kt:41:11:41:11 | var ...; | stmts.kt:41:5:43:5 | { ... } |
+| stmts.kt:41:13:41:13 | var ...; | stmts.kt:41:5:43:5 | { ... } |
+| stmts.kt:41:39:43:5 | { ... } | stmts.kt:41:5:43:5 | { ... } |
+| stmts.kt:42:9:42:24 | ... -> ... | stmts.kt:42:9:42:24 | <Expr>; |
+| stmts.kt:42:9:42:24 | <Expr>; | stmts.kt:41:39:43:5 | { ... } |
+| stmts.kt:42:20:42:24 | break | stmts.kt:42:9:42:24 | ... -> ... |
+| stmts.kt:47:5:55:5 | try ... | stmts.kt:46:23:56:1 | { ... } |
+| stmts.kt:47:9:49:5 | { ... } | stmts.kt:47:5:55:5 | try ... |
+| stmts.kt:48:9:48:30 | throw ... | stmts.kt:47:9:49:5 | { ... } |
+| stmts.kt:50:5:52:5 | catch (...) | stmts.kt:47:5:55:5 | try ... |
+| stmts.kt:50:26:52:5 | { ... } | stmts.kt:50:5:52:5 | catch (...) |
+| stmts.kt:51:9:51:16 | return ... | stmts.kt:50:26:52:5 | { ... } |
+| stmts.kt:53:13:55:5 | { ... } | stmts.kt:47:5:55:5 | try ... |
+| stmts.kt:54:9:54:16 | return ... | stmts.kt:53:13:55:5 | { ... } |
diff --git a/java/ql/test/kotlin/library-tests/this/this.expected b/java/ql/test/kotlin/library-tests/this/this.expected
index f5676fcc17f..7dfcf522f4c 100644
--- a/java/ql/test/kotlin/library-tests/this/this.expected
+++ b/java/ql/test/kotlin/library-tests/this/this.expected
@@ -1,12 +1,3 @@
-extensionReceiverAcc
-| this.kt:10:42:10:45 | this |
-| this.kt:11:42:11:70 | this |
-| this.kt:13:53:13:56 | this |
-| this.kt:14:46:14:74 | this |
-| this.kt:15:53:15:87 | this |
-| this.kt:20:42:20:45 | this |
-| this.kt:29:38:29:41 | this |
-| this.kt:32:38:32:54 | this |
 #select
 | this.kt:5:29:5:32 | this | file://:0:0:0:0 | <none> |
 | this.kt:6:29:6:38 | this | file://:0:0:0:0 | <none> |
@@ -24,3 +15,12 @@ extensionReceiverAcc
 | this.kt:44:13:44:16 | this | file://:0:0:0:0 | <none> |
 | this.kt:45:13:45:16 | this | file://:0:0:0:0 | <none> |
 | this.kt:46:13:46:16 | this | file://:0:0:0:0 | <none> |
+extensionReceiverAcc
+| this.kt:10:42:10:45 | this |
+| this.kt:11:42:11:70 | this |
+| this.kt:13:53:13:56 | this |
+| this.kt:14:46:14:74 | this |
+| this.kt:15:53:15:87 | this |
+| this.kt:20:42:20:45 | this |
+| this.kt:29:38:29:41 | this |
+| this.kt:32:38:32:54 | this |
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.expected b/java/ql/test/kotlin/library-tests/variables/variables.expected
index 9b7abda1536..b826535db59 100644
--- a/java/ql/test/kotlin/library-tests/variables/variables.expected
+++ b/java/ql/test/kotlin/library-tests/variables/variables.expected
@@ -1,13 +1,3 @@
-isFinal
-| variables.kt:6:13:6:18 | int local1 | final |
-| variables.kt:8:13:8:18 | int local2 | non-final |
-| variables.kt:10:13:10:18 | int local3 | final |
-compileTimeConstant
-| variables.kt:3:5:3:21 | prop |
-| variables.kt:3:5:3:21 | this.prop |
-| variables.kt:7:17:7:22 | local1 |
-| variables.kt:15:1:15:21 | VariablesKt.topLevel |
-| variables.kt:15:1:15:21 | VariablesKt.topLevel |
 #select
 | variables.kt:3:5:3:21 | prop | int | variables.kt:3:21:3:21 | 1 |
 | variables.kt:5:20:5:29 | param | int | file://:0:0:0:0 | <none> |
@@ -18,3 +8,13 @@ compileTimeConstant
 | variables.kt:21:11:21:18 | o | C1 | file://:0:0:0:0 | <none> |
 | variables.kt:21:11:21:18 | o | C1 | variables.kt:21:11:21:18 | o |
 | variables.kt:28:9:28:10 | <this> | C1 | file://:0:0:0:0 | <none> |
+isFinal
+| variables.kt:6:13:6:18 | int local1 | final |
+| variables.kt:8:13:8:18 | int local2 | non-final |
+| variables.kt:10:13:10:18 | int local3 | final |
+compileTimeConstant
+| variables.kt:3:5:3:21 | prop |
+| variables.kt:3:5:3:21 | this.prop |
+| variables.kt:7:17:7:22 | local1 |
+| variables.kt:15:1:15:21 | VariablesKt.topLevel |
+| variables.kt:15:1:15:21 | VariablesKt.topLevel |