Skip to content

Commit 7b779ca

Browse files
authored
Merge pull request github#14186 from igfoo/igfoo/kotlin-expected
Kotlin: Regenerate expected test output
2 parents ab6e8b9 + d8a99e6 commit 7b779ca

File tree

16 files changed

+271
-271
lines changed

16 files changed

+271
-271
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
#select
2+
| Annot0j.java:1:19:1:25 | Annot0j | Interface |
3+
| Annot1j.java:1:19:1:25 | Annot1j | Interface |
4+
| def.kt:0:0:0:0 | DefKt | Class |
5+
| def.kt:5:1:21:60 | Annot0k | Interface |
6+
| def.kt:23:1:31:1 | Annot1k | Interface |
7+
| def.kt:33:1:33:10 | X | Class |
8+
| def.kt:34:1:36:1 | Y | Class |
9+
| def.kt:38:1:43:1 | Z | Class |
10+
| use.java:1:14:1:16 | use | Class |
11+
| use.java:14:18:14:18 | Z | Class |
112
annotationDeclarations
213
| Annot0j.java:1:19:1:25 | Annot0j | Annot0j.java:2:9:2:11 | abc |
314
| Annot1j.java:1:19:1:25 | Annot1j | Annot1j.java:2:9:2:9 | a |
@@ -69,14 +80,3 @@ annotationValues
6980
| use.java:13:5:13:88 | Annot1k | use.java:13:57:13:66 | {...} |
7081
| use.java:13:5:13:88 | Annot1k | use.java:13:73:13:87 | Annot0k |
7182
| use.java:13:73:13:87 | Annot0k | use.java:13:86:13:86 | 2 |
72-
#select
73-
| Annot0j.java:1:19:1:25 | Annot0j | Interface |
74-
| Annot1j.java:1:19:1:25 | Annot1j | Interface |
75-
| def.kt:0:0:0:0 | DefKt | Class |
76-
| def.kt:5:1:21:60 | Annot0k | Interface |
77-
| def.kt:23:1:31:1 | Annot1k | Interface |
78-
| def.kt:33:1:33:10 | X | Class |
79-
| def.kt:34:1:36:1 | Y | Class |
80-
| def.kt:38:1:43:1 | Z | Class |
81-
| use.java:1:14:1:16 | use | Class |
82-
| use.java:14:18:14:18 | Z | Class |

java/ql/test/kotlin/library-tests/arrays/test.expected

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
#select
2+
| primitiveArrays.kt:5:12:5:24 | a | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
3+
| primitiveArrays.kt:5:27:5:40 | b | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
4+
| primitiveArrays.kt:5:43:5:53 | c | file://:0:0:0:0 | int[] | int | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
5+
| primitiveArrays.kt:5:56:5:76 | d | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
6+
| primitiveArrays.kt:5:79:5:98 | e | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
7+
| primitiveArrays.kt:5:101:5:118 | f | file://:0:0:0:0 | int[][] | int[] | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
18
cloneMethods
29
| 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 |
310
| 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
2128
| arrayIterators.kt:1:1:13:1 | test | test(java.lang.Integer[],int[],boolean[]) |
2229
| primitiveArrays.kt:3:1:7:1 | Test | Test() |
2330
| primitiveArrays.kt:5:3:5:123 | test | test(java.lang.Integer[],java.lang.Integer[],int[],java.lang.Integer[][],java.lang.Integer[][],int[][]) |
24-
#select
25-
| primitiveArrays.kt:5:12:5:24 | a | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
26-
| primitiveArrays.kt:5:27:5:40 | b | file://:0:0:0:0 | Integer[] | Integer | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
27-
| primitiveArrays.kt:5:43:5:53 | c | file://:0:0:0:0 | int[] | int | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
28-
| primitiveArrays.kt:5:56:5:76 | d | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
29-
| primitiveArrays.kt:5:79:5:98 | e | file://:0:0:0:0 | Integer[][] | Integer[] | Integer | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |
30-
| primitiveArrays.kt:5:101:5:118 | f | file://:0:0:0:0 | int[][] | int[] | int | file://:0:0:0:0 | Kotlin nullable FakeKotlinClass |

java/ql/test/kotlin/library-tests/classes/superTypes.expected

Lines changed: 93 additions & 93 deletions
Large diffs are not rendered by default.

java/ql/test/kotlin/library-tests/controlflow/basic/getASuccessor.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
missingSuccessor
21
#select
32
| Test.kt:0:0:0:0 | TestKt | Class | file://:0:0:0:0 | <none> | <none> |
43
| Test.kt:3:1:80:1 | Test | Class | file://:0:0:0:0 | <none> | <none> |
@@ -259,3 +258,4 @@ missingSuccessor
259258
| Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:118:1:124:1 | fn_when | Method |
260259
| Test.kt:122:12:122:16 | true | BooleanLiteral | Test.kt:122:12:122:16 | <Expr>; | ExprStmt |
261260
| Test.kt:123:8:123:10 | { ... } | BlockStmt | Test.kt:118:1:124:1 | fn_when | Method |
261+
missingSuccessor

java/ql/test/kotlin/library-tests/enum/test.expected

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
enumConstants
2-
| enumUser.kt:3:16:3:17 | A |
3-
| enumUser.kt:3:19:3:20 | B |
4-
| enumUser.kt:3:22:3:22 | C |
51
#select
62
| addAll |
73
| addRange |
@@ -35,3 +31,7 @@ enumConstants
3531
| usesEnum |
3632
| valueOf |
3733
| writeReplace |
34+
enumConstants
35+
| enumUser.kt:3:16:3:17 | A |
36+
| enumUser.kt:3:19:3:20 | B |
37+
| enumUser.kt:3:22:3:22 | C |

java/ql/test/kotlin/library-tests/extensions/parameters.expected

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
#select
2+
| extensions.kt:3:5:3:38 | someClassMethod | extensions.kt:3:25:3:34 | p1 | 0 |
3+
| extensions.kt:6:5:6:41 | anotherClassMethod | extensions.kt:6:28:6:37 | p1 | 0 |
4+
| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:5:9:13 | <this> | 0 |
5+
| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:23:9:32 | p1 | 1 |
6+
| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:5:10:16 | <this> | 0 |
7+
| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:29:10:38 | p1 | 1 |
8+
| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:5:12:13 | <this> | 0 |
9+
| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:23:12:32 | p1 | 1 |
10+
| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:5:13:16 | <this> | 0 |
11+
| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:26:13:35 | p1 | 1 |
12+
| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:5:15:13 | <this> | 0 |
13+
| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:32:15:38 | p1 | 1 |
14+
| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:5:16:16 | <this> | 0 |
15+
| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:35:16:44 | p1 | 1 |
16+
| extensions.kt:18:1:18:51 | bar | extensions.kt:18:5:18:10 | <this> | 0 |
17+
| extensions.kt:18:1:18:51 | bar | extensions.kt:18:16:18:25 | p1 | 1 |
18+
| extensions.kt:30:5:30:55 | baz | extensions.kt:30:9:30:14 | <this> | 0 |
19+
| extensions.kt:30:5:30:55 | baz | extensions.kt:30:20:30:29 | p1 | 1 |
120
parametersWithArgs
221
| extensions.kt:3:25:3:34 | p1 | 0 | extensions.kt:21:34:21:36 | "foo" |
322
| extensions.kt:6:28:6:37 | p1 | 0 | extensions.kt:25:40:25:42 | "foo" |
@@ -28,22 +47,3 @@ extensionParameter
2847
| extensions.kt:16:5:16:16 | <this> |
2948
| extensions.kt:18:5:18:10 | <this> |
3049
| extensions.kt:30:9:30:14 | <this> |
31-
#select
32-
| extensions.kt:3:5:3:38 | someClassMethod | extensions.kt:3:25:3:34 | p1 | 0 |
33-
| extensions.kt:6:5:6:41 | anotherClassMethod | extensions.kt:6:28:6:37 | p1 | 0 |
34-
| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:5:9:13 | <this> | 0 |
35-
| extensions.kt:9:1:9:36 | someFun | extensions.kt:9:23:9:32 | p1 | 1 |
36-
| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:5:10:16 | <this> | 0 |
37-
| extensions.kt:10:1:10:42 | anotherFun | extensions.kt:10:29:10:38 | p1 | 1 |
38-
| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:5:12:13 | <this> | 0 |
39-
| extensions.kt:12:1:12:36 | bothFun | extensions.kt:12:23:12:32 | p1 | 1 |
40-
| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:5:13:16 | <this> | 0 |
41-
| extensions.kt:13:1:13:39 | bothFun | extensions.kt:13:26:13:35 | p1 | 1 |
42-
| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:5:15:13 | <this> | 0 |
43-
| extensions.kt:15:1:15:57 | bothFunDiffTypes | extensions.kt:15:32:15:38 | p1 | 1 |
44-
| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:5:16:16 | <this> | 0 |
45-
| extensions.kt:16:1:16:70 | bothFunDiffTypes | extensions.kt:16:35:16:44 | p1 | 1 |
46-
| extensions.kt:18:1:18:51 | bar | extensions.kt:18:5:18:10 | <this> | 0 |
47-
| extensions.kt:18:1:18:51 | bar | extensions.kt:18:16:18:25 | p1 | 1 |
48-
| extensions.kt:30:5:30:55 | baz | extensions.kt:30:9:30:14 | <this> | 0 |
49-
| extensions.kt:30:5:30:55 | baz | extensions.kt:30:20:30:29 | p1 | 1 |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
isFinalField
22
| test.kt:3:3:3:18 | x |
3-
#select
3+
#select
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diagnostics
2-
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Number.toChar in java.lang.Number |
31
#select
42
| Integer |
53
| Iterable<? extends T> |
64
| Object |
75
| int |
6+
diagnostics
7+
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Number.toChar in java.lang.Number |

java/ql/test/kotlin/library-tests/java_and_kotlin/test.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#select
2+
| Java.java:5:3:5:26 | kotlinFun(...) | Kotlin.kt:2:2:4:2 | kotlinFun |
3+
| Java.java:11:11:11:22 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
4+
| Kotlin.kt:13:40:13:51 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
5+
| Kotlin.kt:14:48:14:59 | fn1(...) | Kotlin.kt:9:18:9:46 | fn1 |
16
methods
27
| Java.java:4:7:4:13 | javaFun | javaFun() |
38
| Java.java:10:17:10:19 | fn0 | fn0(int) |
@@ -12,8 +17,3 @@ overrides
1217
| Kotlin.kt:14:22:14:59 | fn1 | Kotlin.kt:9:18:9:46 | fn1 |
1318
signature_mismatch
1419
| Kotlin.kt:9:18:9:46 | fn1 | fn1(int) |
15-
#select
16-
| Java.java:5:3:5:26 | kotlinFun(...) | Kotlin.kt:2:2:4:2 | kotlinFun |
17-
| Java.java:11:11:11:22 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
18-
| Kotlin.kt:13:40:13:51 | fn0(...) | Kotlin.kt:8:10:8:38 | fn0 |
19-
| Kotlin.kt:14:48:14:59 | fn1(...) | Kotlin.kt:9:18:9:46 | fn1 |
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#select
2+
| Kotlin.kt:2:11:3:2 | kotlinFun$main | final |
3+
| Kotlin.kt:2:11:3:2 | kotlinFun$main | internal |
4+
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | final |
5+
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | internal |
6+
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | static |
17
isPublic
28
isInternal
39
| Kotlin.kt:2:11:3:2 | kotlinFun$main |
@@ -8,9 +14,3 @@ modifiers_methods
814
| file://:0:0:0:0 | internal | Kotlin.kt:2:11:3:2 | kotlinFun$main |
915
| file://:0:0:0:0 | internal | Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
1016
| file://:0:0:0:0 | static | Kotlin.kt:6:10:6:36 | topLevelKotlinFun |
11-
#select
12-
| Kotlin.kt:2:11:3:2 | kotlinFun$main | final |
13-
| Kotlin.kt:2:11:3:2 | kotlinFun$main | internal |
14-
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | final |
15-
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | internal |
16-
| Kotlin.kt:6:10:6:36 | topLevelKotlinFun | static |

0 commit comments

Comments
 (0)