Skip to content

Commit a7eac11

Browse files
igfooigfoo
authored
Merge pull request github#15569 from igfoo/igfoo/kt2-accept
Kotlin 2: Accept more location changes
2 parents 1520305 + 0547c87 commit a7eac11

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -277,19 +277,19 @@
277277
| enumClass.kt:8:3:11:4 | VAL | TypeAccess |
278278
| enumClass.kt:8:3:11:4 | new EnumWithFunctions(...) | ClassInstanceExpr |
279279
| enumClass.kt:8:3:11:4 | new VAL(...) | ClassInstanceExpr |
280-
| enumClass.kt:9:14:9:30 | int | TypeAccess |
280+
| enumClass.kt:9:5:9:30 | int | TypeAccess |
281281
| enumClass.kt:9:20:9:25 | int | TypeAccess |
282282
| enumClass.kt:9:30:9:30 | i | VarAccess |
283-
| enumClass.kt:10:14:10:42 | int | TypeAccess |
283+
| enumClass.kt:10:5:10:42 | int | TypeAccess |
284284
| enumClass.kt:10:20:10:25 | int | TypeAccess |
285285
| enumClass.kt:10:30:10:33 | this | ThisAccess |
286286
| enumClass.kt:10:30:10:38 | f(...) | MethodCall |
287287
| enumClass.kt:10:30:10:42 | ... + ... | AddExpr |
288288
| enumClass.kt:10:37:10:37 | i | VarAccess |
289289
| enumClass.kt:10:42:10:42 | i | VarAccess |
290-
| enumClass.kt:13:12:13:29 | int | TypeAccess |
290+
| enumClass.kt:13:3:13:29 | int | TypeAccess |
291291
| enumClass.kt:13:18:13:23 | int | TypeAccess |
292-
| enumClass.kt:14:12:14:29 | int | TypeAccess |
292+
| enumClass.kt:14:3:14:29 | int | TypeAccess |
293293
| enumClass.kt:14:18:14:23 | int | TypeAccess |
294294
| methods2.kt:4:1:5:1 | Unit | TypeAccess |
295295
| methods2.kt:4:26:4:31 | int | TypeAccess |
@@ -341,15 +341,15 @@
341341
| methods4.kt:7:5:7:34 | Unit | TypeAccess |
342342
| methods4.kt:7:11:7:29 | InsideNestedTest | TypeAccess |
343343
| methods5.kt:3:1:11:1 | Unit | TypeAccess |
344-
| methods5.kt:4:7:4:7 | x | LocalVariableDeclExpr |
344+
| methods5.kt:4:3:4:11 | x | LocalVariableDeclExpr |
345345
| methods5.kt:4:11:4:11 | 5 | IntegerLiteral |
346346
| methods5.kt:5:3:5:27 | int | TypeAccess |
347347
| methods5.kt:5:13:5:18 | int | TypeAccess |
348348
| methods5.kt:5:23:5:23 | i | VarAccess |
349349
| methods5.kt:5:23:5:27 | ... + ... | AddExpr |
350350
| methods5.kt:5:27:5:27 | x | VarAccess |
351-
| methods5.kt:6:3:6:3 | x | VarAccess |
352351
| methods5.kt:6:3:6:7 | ...=... | AssignExpr |
352+
| methods5.kt:6:3:6:7 | x | VarAccess |
353353
| methods5.kt:6:7:6:7 | 6 | IntegerLiteral |
354354
| methods5.kt:7:3:7:15 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
355355
| methods5.kt:7:3:7:15 | Object | TypeAccess |
@@ -358,8 +358,8 @@
358358
| methods5.kt:7:3:7:15 | a(...) | MethodCall |
359359
| methods5.kt:7:3:7:15 | new (...) | ClassInstanceExpr |
360360
| methods5.kt:7:13:7:14 | 42 | IntegerLiteral |
361-
| methods5.kt:8:3:8:3 | x | VarAccess |
362361
| methods5.kt:8:3:8:7 | ...=... | AssignExpr |
362+
| methods5.kt:8:3:8:7 | x | VarAccess |
363363
| methods5.kt:8:7:8:7 | 7 | IntegerLiteral |
364364
| methods5.kt:9:3:9:32 | int | TypeAccess |
365365
| methods5.kt:9:12:9:17 | C1<T1> | TypeAccess |
@@ -376,7 +376,7 @@
376376
| methods5.kt:10:13:10:18 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
377377
| methods5.kt:10:13:10:18 | Unit | TypeAccess |
378378
| methods5.kt:10:16:10:17 | 42 | IntegerLiteral |
379-
| methods6.kt:3:9:4:1 | Unit | TypeAccess |
379+
| methods6.kt:3:1:4:1 | Unit | TypeAccess |
380380
| methods.kt:2:1:3:1 | Unit | TypeAccess |
381381
| methods.kt:2:20:2:25 | int | TypeAccess |
382382
| methods.kt:2:28:2:33 | int | TypeAccess |
@@ -394,9 +394,9 @@
394394
| methods.kt:11:9:11:28 | topLevelMethod(...) | MethodCall |
395395
| methods.kt:11:24:11:24 | b | VarAccess |
396396
| methods.kt:11:27:11:27 | 4 | IntegerLiteral |
397-
| methods.kt:14:12:14:29 | Unit | TypeAccess |
398-
| methods.kt:15:15:15:35 | Unit | TypeAccess |
399-
| methods.kt:16:13:16:31 | Unit | TypeAccess |
400-
| methods.kt:17:14:17:33 | Unit | TypeAccess |
397+
| methods.kt:14:5:14:29 | Unit | TypeAccess |
398+
| methods.kt:15:5:15:35 | Unit | TypeAccess |
399+
| methods.kt:16:5:16:31 | Unit | TypeAccess |
400+
| methods.kt:17:5:17:33 | Unit | TypeAccess |
401401
| methods.kt:18:5:18:36 | Unit | TypeAccess |
402-
| methods.kt:19:12:19:29 | Unit | TypeAccess |
402+
| methods.kt:19:5:19:29 | Unit | TypeAccess |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ methods
22
| clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:0:0:0:0 | <clinit> | <clinit>() | static | Compiler generated |
33
| clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | getTopLevelInt | getTopLevelInt() | final, public, static | Compiler generated |
44
| clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | setTopLevelInt | setTopLevelInt(int) | final, public, static | Compiler generated |
5+
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component1 | component1() | final, public | Compiler generated |
6+
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component2 | component2() | final, public | Compiler generated |
7+
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | copy | copy(int,java.lang.String) | final, public | Compiler generated |
8+
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | copy$default | copy$default(DataClass,int,java.lang.String,int,java.lang.Object) | public, static | Compiler generated |
59
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | equals | equals(java.lang.Object) | override, public | Compiler generated |
610
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | hashCode | hashCode() | override, public | Compiler generated |
711
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | toString | toString() | override, public | Compiler generated |
8-
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:1:1:47 | copy | copy(int,java.lang.String) | final, public | Compiler generated |
9-
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:1:1:47 | copy$default | copy$default(DataClass,int,java.lang.String,int,java.lang.Object) | public, static | Compiler generated |
10-
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:22:1:31 | component1 | component1() | final, public | Compiler generated |
1112
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:22:1:31 | getX | getX() | final, public | Compiler generated |
12-
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | component2 | component2() | final, public | Compiler generated |
1313
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | getY | getY() | final, public | Compiler generated |
1414
| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | setY | setY(java.lang.String) | final, public | Compiler generated |
15-
| delegates.kt:3:1:12:1 | MyClass | delegates.kt:4:5:6:5 | getLazyProp | getLazyProp() | final, public | Compiler generated |
16-
| delegates.kt:3:1:12:1 | MyClass | delegates.kt:8:5:11:5 | getObservableProp | getObservableProp() | final, public | Compiler generated |
15+
| delegates.kt:3:1:12:1 | MyClass | delegates.kt:4:21:6:5 | getLazyProp | getLazyProp() | final, public | Compiler generated |
1716
| delegates.kt:3:1:12:1 | MyClass | delegates.kt:8:5:11:5 | setObservableProp | setObservableProp(java.lang.String) | final, public | Compiler generated |
17+
| delegates.kt:3:1:12:1 | MyClass | delegates.kt:8:35:11:5 | getObservableProp | getObservableProp() | final, public | Compiler generated |
1818
| delegates.kt:4:21:6:5 | new KProperty1<MyClass,Integer>(...) { ... } | delegates.kt:4:21:6:5 | get | get(MyClass) | override, public | |
1919
| delegates.kt:4:21:6:5 | new KProperty1<MyClass,Integer>(...) { ... } | delegates.kt:4:21:6:5 | invoke | invoke(MyClass) | override, public | |
2020
| delegates.kt:4:26:6:5 | new Function0<Integer>(...) { ... } | delegates.kt:4:26:6:5 | invoke | invoke() | final, override, public | |

‎java/ql/test-kotlin2/library-tests/methods/parameters.expected

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
| clinit.kt:3:1:3:24 | setTopLevelInt | clinit.kt:3:1:3:24 | <set-?> | 0 |
2+
| dataClass.kt:0:0:0:0 | copy | dataClass.kt:0:0:0:0 | x | 0 |
3+
| dataClass.kt:0:0:0:0 | copy | dataClass.kt:0:0:0:0 | y | 1 |
4+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p0 | 0 |
5+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p1 | 1 |
6+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p2 | 2 |
7+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p3 | 3 |
8+
| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p4 | 4 |
29
| dataClass.kt:0:0:0:0 | equals | dataClass.kt:0:0:0:0 | other | 0 |
3-
| dataClass.kt:1:1:1:47 | copy | dataClass.kt:1:22:1:31 | x | 0 |
4-
| dataClass.kt:1:1:1:47 | copy | dataClass.kt:1:34:1:46 | y | 1 |
5-
| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p0 | 0 |
6-
| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p1 | 1 |
7-
| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p2 | 2 |
8-
| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p3 | 3 |
9-
| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p4 | 4 |
1010
| dataClass.kt:1:34:1:46 | setY | dataClass.kt:1:34:1:46 | <set-?> | 0 |
1111
| delegates.kt:4:21:6:5 | get | delegates.kt:4:21:6:5 | a0 | 0 |
1212
| delegates.kt:4:21:6:5 | invoke | delegates.kt:4:21:6:5 | a0 | 0 |

0 commit comments

Comments
 (0)