Skip to content

Commit af5cd7c

Browse files
igfooigfoo
authored
Merge pull request #13723 from igfoo/igfoo/kotlin-1.9.0
Kotlin: Run CI with 1.9.0
2 parents c54e93f + b83f027 commit af5cd7c

File tree

9 files changed

+72
-43
lines changed

9 files changed

+72
-43
lines changed

‎java/kotlin-extractor/kotlin_plugin_versions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def version_string_to_tuple(version):
2222
return tuple([int(m.group(i)) for i in range(1, 4)] + [m.group(4)])
2323

2424
# Version number used by CI.
25-
ci_version = '1.8.10'
25+
ci_version = '1.9.0'
2626

2727
many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0', '1.9.0-Beta' ]
2828

‎java/ql/test/kotlin/library-tests/annotation-accessor-result-type/test.ql

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import java
22

33
query predicate classExprs(Expr e, string tstr) {
4+
exists(e.getFile().getRelativePath()) and
45
tstr = e.getType().toString() and
56
tstr.matches("%Class%")
67
}

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,18 @@ def.kt:
169169
# 33| 0: [SuperConstructorInvocationStmt] super(...)
170170
# 33| 1: [BlockStmt] { ... }
171171
# 34| 5: [Class] Y
172-
# 0| 2: [Method] valueOf
172+
# 0| 2: [Method] getEntries
173+
# 0| 3: [TypeAccess] EnumEntries<Y>
174+
# 0| 0: [TypeAccess] Y
175+
# 0| 3: [Method] valueOf
173176
# 0| 3: [TypeAccess] Y
174177
#-----| 4: (Parameters)
175178
# 0| 0: [Parameter] value
176179
# 0| 0: [TypeAccess] String
177-
# 0| 3: [Method] values
180+
# 0| 4: [Method] values
178181
# 0| 3: [TypeAccess] Y[]
179182
# 0| 0: [TypeAccess] Y
180-
# 34| 4: [Constructor] Y
183+
# 34| 5: [Constructor] Y
181184
# 34| 5: [BlockStmt] { ... }
182185
# 34| 0: [ExprStmt] <Expr>;
183186
# 34| 0: [ClassInstanceExpr] new Enum(...)
@@ -186,15 +189,15 @@ def.kt:
186189
# 34| 0: [NullLiteral] null
187190
# 34| 1: [IntegerLiteral] 0
188191
# 34| 1: [BlockStmt] { ... }
189-
# 35| 5: [FieldDeclaration] Y A;
192+
# 35| 6: [FieldDeclaration] Y A;
190193
# 35| -1: [TypeAccess] Y
191194
# 35| 0: [ClassInstanceExpr] new Y(...)
192195
# 35| -3: [TypeAccess] Y
193-
# 35| 6: [FieldDeclaration] Y B;
196+
# 35| 7: [FieldDeclaration] Y B;
194197
# 35| -1: [TypeAccess] Y
195198
# 35| 0: [ClassInstanceExpr] new Y(...)
196199
# 35| -3: [TypeAccess] Y
197-
# 35| 7: [FieldDeclaration] Y C;
200+
# 35| 8: [FieldDeclaration] Y C;
198201
# 35| -1: [TypeAccess] Y
199202
# 35| 0: [ClassInstanceExpr] new Y(...)
200203
# 35| -3: [TypeAccess] Y

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

+21-15
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,18 @@ classes.kt:
160160
# 42| -1: [TypeAccess] int
161161
# 42| 0: [IntegerLiteral] 3
162162
# 49| 11: [Class] Direction
163-
# 0| 2: [Method] valueOf
163+
# 0| 2: [Method] getEntries
164+
# 0| 3: [TypeAccess] EnumEntries<Direction>
165+
# 0| 0: [TypeAccess] Direction
166+
# 0| 3: [Method] valueOf
164167
# 0| 3: [TypeAccess] Direction
165168
#-----| 4: (Parameters)
166169
# 0| 0: [Parameter] value
167170
# 0| 0: [TypeAccess] String
168-
# 0| 3: [Method] values
171+
# 0| 4: [Method] values
169172
# 0| 3: [TypeAccess] Direction[]
170173
# 0| 0: [TypeAccess] Direction
171-
# 49| 4: [Constructor] Direction
174+
# 49| 5: [Constructor] Direction
172175
# 49| 5: [BlockStmt] { ... }
173176
# 49| 0: [ExprStmt] <Expr>;
174177
# 49| 0: [ClassInstanceExpr] new Enum(...)
@@ -177,32 +180,35 @@ classes.kt:
177180
# 49| 0: [NullLiteral] null
178181
# 49| 1: [IntegerLiteral] 0
179182
# 49| 1: [BlockStmt] { ... }
180-
# 50| 5: [FieldDeclaration] Direction NORTH;
183+
# 50| 6: [FieldDeclaration] Direction NORTH;
181184
# 50| -1: [TypeAccess] Direction
182185
# 50| 0: [ClassInstanceExpr] new Direction(...)
183186
# 50| -3: [TypeAccess] Direction
184-
# 50| 6: [FieldDeclaration] Direction SOUTH;
187+
# 50| 7: [FieldDeclaration] Direction SOUTH;
185188
# 50| -1: [TypeAccess] Direction
186189
# 50| 0: [ClassInstanceExpr] new Direction(...)
187190
# 50| -3: [TypeAccess] Direction
188-
# 50| 7: [FieldDeclaration] Direction WEST;
191+
# 50| 8: [FieldDeclaration] Direction WEST;
189192
# 50| -1: [TypeAccess] Direction
190193
# 50| 0: [ClassInstanceExpr] new Direction(...)
191194
# 50| -3: [TypeAccess] Direction
192-
# 50| 8: [FieldDeclaration] Direction EAST;
195+
# 50| 9: [FieldDeclaration] Direction EAST;
193196
# 50| -1: [TypeAccess] Direction
194197
# 50| 0: [ClassInstanceExpr] new Direction(...)
195198
# 50| -3: [TypeAccess] Direction
196199
# 53| 12: [Class] Color
197-
# 0| 2: [Method] valueOf
200+
# 0| 2: [Method] getEntries
201+
# 0| 3: [TypeAccess] EnumEntries<Color>
202+
# 0| 0: [TypeAccess] Color
203+
# 0| 3: [Method] valueOf
198204
# 0| 3: [TypeAccess] Color
199205
#-----| 4: (Parameters)
200206
# 0| 0: [Parameter] value
201207
# 0| 0: [TypeAccess] String
202-
# 0| 3: [Method] values
208+
# 0| 4: [Method] values
203209
# 0| 3: [TypeAccess] Color[]
204210
# 0| 0: [TypeAccess] Color
205-
# 53| 4: [Constructor] Color
211+
# 53| 5: [Constructor] Color
206212
#-----| 4: (Parameters)
207213
# 53| 0: [Parameter] rgb
208214
# 53| 0: [TypeAccess] int
@@ -217,26 +223,26 @@ classes.kt:
217223
# 53| 0: [ExprStmt] <Expr>;
218224
# 53| 0: [KtInitializerAssignExpr] ...=...
219225
# 53| 0: [VarAccess] rgb
220-
# 53| 5: [Method] getRgb
226+
# 53| 6: [Method] getRgb
221227
# 53| 3: [TypeAccess] int
222228
# 53| 5: [BlockStmt] { ... }
223229
# 53| 0: [ReturnStmt] return ...
224230
# 53| 0: [VarAccess] this.rgb
225231
# 53| -1: [ThisAccess] this
226-
# 53| 6: [FieldDeclaration] int rgb;
232+
# 53| 7: [FieldDeclaration] int rgb;
227233
# 53| -1: [TypeAccess] int
228234
# 53| 0: [VarAccess] rgb
229-
# 54| 7: [FieldDeclaration] Color RED;
235+
# 54| 8: [FieldDeclaration] Color RED;
230236
# 54| -1: [TypeAccess] Color
231237
# 54| 0: [ClassInstanceExpr] new Color(...)
232238
# 54| -3: [TypeAccess] Color
233239
# 54| 0: [IntegerLiteral] 16711680
234-
# 55| 8: [FieldDeclaration] Color GREEN;
240+
# 55| 9: [FieldDeclaration] Color GREEN;
235241
# 55| -1: [TypeAccess] Color
236242
# 55| 0: [ClassInstanceExpr] new Color(...)
237243
# 55| -3: [TypeAccess] Color
238244
# 55| 0: [IntegerLiteral] 65280
239-
# 56| 9: [FieldDeclaration] Color BLUE;
245+
# 56| 10: [FieldDeclaration] Color BLUE;
240246
# 56| -1: [TypeAccess] Color
241247
# 56| 0: [ClassInstanceExpr] new Color(...)
242248
# 56| -3: [TypeAccess] Color

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

+21-15
Original file line numberDiff line numberDiff line change
@@ -3344,15 +3344,18 @@ exprs.kt:
33443344
# 154| 0: [SuperConstructorInvocationStmt] super(...)
33453345
# 154| 1: [BlockStmt] { ... }
33463346
# 174| 6: [Class] Direction
3347-
# 0| 2: [Method] valueOf
3347+
# 0| 2: [Method] getEntries
3348+
# 0| 3: [TypeAccess] EnumEntries<Direction>
3349+
# 0| 0: [TypeAccess] Direction
3350+
# 0| 3: [Method] valueOf
33483351
# 0| 3: [TypeAccess] Direction
33493352
#-----| 4: (Parameters)
33503353
# 0| 0: [Parameter] value
33513354
# 0| 0: [TypeAccess] String
3352-
# 0| 3: [Method] values
3355+
# 0| 4: [Method] values
33533356
# 0| 3: [TypeAccess] Direction[]
33543357
# 0| 0: [TypeAccess] Direction
3355-
# 174| 4: [Constructor] Direction
3358+
# 174| 5: [Constructor] Direction
33563359
# 174| 5: [BlockStmt] { ... }
33573360
# 174| 0: [ExprStmt] <Expr>;
33583361
# 174| 0: [ClassInstanceExpr] new Enum(...)
@@ -3361,32 +3364,35 @@ exprs.kt:
33613364
# 174| 0: [NullLiteral] null
33623365
# 174| 1: [IntegerLiteral] 0
33633366
# 174| 1: [BlockStmt] { ... }
3364-
# 175| 5: [FieldDeclaration] Direction NORTH;
3367+
# 175| 6: [FieldDeclaration] Direction NORTH;
33653368
# 175| -1: [TypeAccess] Direction
33663369
# 175| 0: [ClassInstanceExpr] new Direction(...)
33673370
# 175| -3: [TypeAccess] Direction
3368-
# 175| 6: [FieldDeclaration] Direction SOUTH;
3371+
# 175| 7: [FieldDeclaration] Direction SOUTH;
33693372
# 175| -1: [TypeAccess] Direction
33703373
# 175| 0: [ClassInstanceExpr] new Direction(...)
33713374
# 175| -3: [TypeAccess] Direction
3372-
# 175| 7: [FieldDeclaration] Direction WEST;
3375+
# 175| 8: [FieldDeclaration] Direction WEST;
33733376
# 175| -1: [TypeAccess] Direction
33743377
# 175| 0: [ClassInstanceExpr] new Direction(...)
33753378
# 175| -3: [TypeAccess] Direction
3376-
# 175| 8: [FieldDeclaration] Direction EAST;
3379+
# 175| 9: [FieldDeclaration] Direction EAST;
33773380
# 175| -1: [TypeAccess] Direction
33783381
# 175| 0: [ClassInstanceExpr] new Direction(...)
33793382
# 175| -3: [TypeAccess] Direction
33803383
# 178| 7: [Class] Color
3381-
# 0| 2: [Method] valueOf
3384+
# 0| 2: [Method] getEntries
3385+
# 0| 3: [TypeAccess] EnumEntries<Color>
3386+
# 0| 0: [TypeAccess] Color
3387+
# 0| 3: [Method] valueOf
33823388
# 0| 3: [TypeAccess] Color
33833389
#-----| 4: (Parameters)
33843390
# 0| 0: [Parameter] value
33853391
# 0| 0: [TypeAccess] String
3386-
# 0| 3: [Method] values
3392+
# 0| 4: [Method] values
33873393
# 0| 3: [TypeAccess] Color[]
33883394
# 0| 0: [TypeAccess] Color
3389-
# 178| 4: [Constructor] Color
3395+
# 178| 5: [Constructor] Color
33903396
#-----| 4: (Parameters)
33913397
# 178| 0: [Parameter] rgb
33923398
# 178| 0: [TypeAccess] int
@@ -3401,26 +3407,26 @@ exprs.kt:
34013407
# 178| 0: [ExprStmt] <Expr>;
34023408
# 178| 0: [KtInitializerAssignExpr] ...=...
34033409
# 178| 0: [VarAccess] rgb
3404-
# 178| 5: [Method] getRgb
3410+
# 178| 6: [Method] getRgb
34053411
# 178| 3: [TypeAccess] int
34063412
# 178| 5: [BlockStmt] { ... }
34073413
# 178| 0: [ReturnStmt] return ...
34083414
# 178| 0: [VarAccess] this.rgb
34093415
# 178| -1: [ThisAccess] this
3410-
# 178| 6: [FieldDeclaration] int rgb;
3416+
# 178| 7: [FieldDeclaration] int rgb;
34113417
# 178| -1: [TypeAccess] int
34123418
# 178| 0: [VarAccess] rgb
3413-
# 179| 7: [FieldDeclaration] Color RED;
3419+
# 179| 8: [FieldDeclaration] Color RED;
34143420
# 179| -1: [TypeAccess] Color
34153421
# 179| 0: [ClassInstanceExpr] new Color(...)
34163422
# 179| -3: [TypeAccess] Color
34173423
# 179| 0: [IntegerLiteral] 16711680
3418-
# 180| 8: [FieldDeclaration] Color GREEN;
3424+
# 180| 9: [FieldDeclaration] Color GREEN;
34193425
# 180| -1: [TypeAccess] Color
34203426
# 180| 0: [ClassInstanceExpr] new Color(...)
34213427
# 180| -3: [TypeAccess] Color
34223428
# 180| 0: [IntegerLiteral] 65280
3423-
# 181| 9: [FieldDeclaration] Color BLUE;
3429+
# 181| 10: [FieldDeclaration] Color BLUE;
34243430
# 181| -1: [TypeAccess] Color
34253431
# 181| 0: [ClassInstanceExpr] new Color(...)
34263432
# 181| -3: [TypeAccess] Color

‎java/ql/test/kotlin/library-tests/exprs/exprs.expected

+4
Original file line numberDiff line numberDiff line change
@@ -885,10 +885,14 @@
885885
| delegatedProperties.kt:87:34:87:46 | this | delegatedProperties.kt:87:34:87:46 | invoke | ThisAccess |
886886
| exprs.kt:0:0:0:0 | Color | file://:0:0:0:0 | <none> | TypeAccess |
887887
| exprs.kt:0:0:0:0 | Color | file://:0:0:0:0 | <none> | TypeAccess |
888+
| exprs.kt:0:0:0:0 | Color | file://:0:0:0:0 | <none> | TypeAccess |
888889
| exprs.kt:0:0:0:0 | Color[] | file://:0:0:0:0 | <none> | TypeAccess |
889890
| exprs.kt:0:0:0:0 | Direction | file://:0:0:0:0 | <none> | TypeAccess |
890891
| exprs.kt:0:0:0:0 | Direction | file://:0:0:0:0 | <none> | TypeAccess |
892+
| exprs.kt:0:0:0:0 | Direction | file://:0:0:0:0 | <none> | TypeAccess |
891893
| exprs.kt:0:0:0:0 | Direction[] | file://:0:0:0:0 | <none> | TypeAccess |
894+
| exprs.kt:0:0:0:0 | EnumEntries<Color> | file://:0:0:0:0 | <none> | TypeAccess |
895+
| exprs.kt:0:0:0:0 | EnumEntries<Direction> | file://:0:0:0:0 | <none> | TypeAccess |
892896
| exprs.kt:0:0:0:0 | String | file://:0:0:0:0 | <none> | TypeAccess |
893897
| exprs.kt:0:0:0:0 | String | file://:0:0:0:0 | <none> | TypeAccess |
894898
| exprs.kt:4:1:142:1 | int | file://:0:0:0:0 | <none> | TypeAccess |

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,18 @@ A.kt:
7474
# 20| 0: [VarAccess] B.x
7575
# 20| -1: [TypeAccess] B
7676
# 23| 11: [Class] Enu
77-
# 0| 2: [Method] valueOf
77+
# 0| 2: [Method] getEntries
78+
# 0| 3: [TypeAccess] EnumEntries<Enu>
79+
# 0| 0: [TypeAccess] Enu
80+
# 0| 3: [Method] valueOf
7881
# 0| 3: [TypeAccess] Enu
7982
#-----| 4: (Parameters)
8083
# 0| 0: [Parameter] value
8184
# 0| 0: [TypeAccess] String
82-
# 0| 3: [Method] values
85+
# 0| 4: [Method] values
8386
# 0| 3: [TypeAccess] Enu[]
8487
# 0| 0: [TypeAccess] Enu
85-
# 23| 4: [Constructor] Enu
88+
# 23| 5: [Constructor] Enu
8689
# 23| 5: [BlockStmt] { ... }
8790
# 23| 0: [ExprStmt] <Expr>;
8891
# 23| 0: [ClassInstanceExpr] new Enum(...)
@@ -91,15 +94,15 @@ A.kt:
9194
# 23| 0: [NullLiteral] null
9295
# 23| 1: [IntegerLiteral] 0
9396
# 23| 1: [BlockStmt] { ... }
94-
# 24| 5: [FieldDeclaration] Enu A;
97+
# 24| 6: [FieldDeclaration] Enu A;
9598
# 24| -1: [TypeAccess] Enu
9699
# 24| 0: [ClassInstanceExpr] new Enu(...)
97100
# 24| -3: [TypeAccess] Enu
98-
# 24| 6: [FieldDeclaration] Enu B;
101+
# 24| 7: [FieldDeclaration] Enu B;
99102
# 24| -1: [TypeAccess] Enu
100103
# 24| 0: [ClassInstanceExpr] new Enu(...)
101104
# 24| -3: [TypeAccess] Enu
102-
# 24| 7: [FieldDeclaration] Enu C;
105+
# 24| 8: [FieldDeclaration] Enu C;
103106
# 24| -1: [TypeAccess] Enu
104107
# 24| 0: [ClassInstanceExpr] new Enu(...)
105108
# 24| -3: [TypeAccess] Enu

‎java/ql/test/kotlin/library-tests/methods/exprs.expected

+4
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,11 @@
225225
| delegates.kt:10:33:10:35 | new | VarAccess |
226226
| enumClass.kt:0:0:0:0 | EnumClass | TypeAccess |
227227
| enumClass.kt:0:0:0:0 | EnumClass | TypeAccess |
228+
| enumClass.kt:0:0:0:0 | EnumClass | TypeAccess |
228229
| enumClass.kt:0:0:0:0 | EnumClass[] | TypeAccess |
230+
| enumClass.kt:0:0:0:0 | EnumEntries<EnumClass> | TypeAccess |
231+
| enumClass.kt:0:0:0:0 | EnumEntries<EnumWithFunctions> | TypeAccess |
232+
| enumClass.kt:0:0:0:0 | EnumWithFunctions | TypeAccess |
229233
| enumClass.kt:0:0:0:0 | EnumWithFunctions | TypeAccess |
230234
| enumClass.kt:0:0:0:0 | EnumWithFunctions | TypeAccess |
231235
| enumClass.kt:0:0:0:0 | EnumWithFunctions[] | TypeAccess |

‎java/ql/test/kotlin/library-tests/methods/methods.expected

+2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ methods
2626
| delegates.kt:8:32:11:5 | new KMutableProperty1<MyClass,String>(...) { ... } | delegates.kt:8:32:11:5 | set | set(MyClass,java.lang.String) | override, public | |
2727
| delegates.kt:8:66:11:5 | new Function3<KProperty<?>,String,String,Unit>(...) { ... } | delegates.kt:8:66:11:5 | invoke | invoke(kotlin.reflect.KProperty,java.lang.String,java.lang.String) | final, override, public | |
2828
| enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:0:0:0:0 | <clinit> | <clinit>() | static | Compiler generated |
29+
| enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:0:0:0:0 | getEntries | getEntries() | final, public, static | Compiler generated |
2930
| enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:0:0:0:0 | valueOf | valueOf(java.lang.String) | final, public, static | Compiler generated |
3031
| enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:0:0:0:0 | values | values() | final, public, static | Compiler generated |
3132
| enumClass.kt:1:1:4:1 | EnumClass | enumClass.kt:1:22:1:31 | getV | getV() | final, public | Compiler generated |
3233
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | <clinit> | <clinit>() | static | Compiler generated |
34+
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | getEntries | getEntries() | final, public, static | Compiler generated |
3335
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | valueOf | valueOf(java.lang.String) | final, public, static | Compiler generated |
3436
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:0:0:0:0 | values | values() | final, public, static | Compiler generated |
3537
| enumClass.kt:6:1:16:1 | EnumWithFunctions | enumClass.kt:13:12:13:29 | f | f(int) | abstract, public | |

0 commit comments

Comments
 (0)