Merge pull request #15569 from igfoo/igfoo/kt2-accept

Kotlin 2: Accept more location changes
github · Feb 12, 2024 · a7eac11 · a7eac11
2 parents 1520305 + 0547c87
commit a7eac11
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/java/ql/test-kotlin2/library-tests/methods/exprs.expected b/java/ql/test-kotlin2/library-tests/methods/exprs.expected
@@ -277,19 +277,19 @@
 | enumClass.kt:8:3:11:4 | VAL | TypeAccess |
 | enumClass.kt:8:3:11:4 | new EnumWithFunctions(...) | ClassInstanceExpr |
 | enumClass.kt:8:3:11:4 | new VAL(...) | ClassInstanceExpr |
-| enumClass.kt:9:14:9:30 | int | TypeAccess |
+| enumClass.kt:9:5:9:30 | int | TypeAccess |
 | enumClass.kt:9:20:9:25 | int | TypeAccess |
 | enumClass.kt:9:30:9:30 | i | VarAccess |
-| enumClass.kt:10:14:10:42 | int | TypeAccess |
+| enumClass.kt:10:5:10:42 | int | TypeAccess |
 | enumClass.kt:10:20:10:25 | int | TypeAccess |
 | enumClass.kt:10:30:10:33 | this | ThisAccess |
 | enumClass.kt:10:30:10:38 | f(...) | MethodCall |
 | enumClass.kt:10:30:10:42 | ... + ... | AddExpr |
 | enumClass.kt:10:37:10:37 | i | VarAccess |
 | enumClass.kt:10:42:10:42 | i | VarAccess |
-| enumClass.kt:13:12:13:29 | int | TypeAccess |
+| enumClass.kt:13:3:13:29 | int | TypeAccess |
 | enumClass.kt:13:18:13:23 | int | TypeAccess |
-| enumClass.kt:14:12:14:29 | int | TypeAccess |
+| enumClass.kt:14:3:14:29 | int | TypeAccess |
 | enumClass.kt:14:18:14:23 | int | TypeAccess |
 | methods2.kt:4:1:5:1 | Unit | TypeAccess |
 | methods2.kt:4:26:4:31 | int | TypeAccess |
@@ -341,15 +341,15 @@
 | methods4.kt:7:5:7:34 | Unit | TypeAccess |
 | methods4.kt:7:11:7:29 | InsideNestedTest | TypeAccess |
 | methods5.kt:3:1:11:1 | Unit | TypeAccess |
-| methods5.kt:4:7:4:7 | x | LocalVariableDeclExpr |
+| methods5.kt:4:3:4:11 | x | LocalVariableDeclExpr |
 | methods5.kt:4:11:4:11 | 5 | IntegerLiteral |
 | methods5.kt:5:3:5:27 | int | TypeAccess |
 | methods5.kt:5:13:5:18 | int | TypeAccess |
 | methods5.kt:5:23:5:23 | i | VarAccess |
 | methods5.kt:5:23:5:27 | ... + ... | AddExpr |
 | methods5.kt:5:27:5:27 | x | VarAccess |
-| methods5.kt:6:3:6:3 | x | VarAccess |
 | methods5.kt:6:3:6:7 | ...=... | AssignExpr |
+| methods5.kt:6:3:6:7 | x | VarAccess |
 | methods5.kt:6:7:6:7 | 6 | IntegerLiteral |
 | methods5.kt:7:3:7:15 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
 | methods5.kt:7:3:7:15 | Object | TypeAccess |
@@ -358,8 +358,8 @@
 | methods5.kt:7:3:7:15 | a(...) | MethodCall |
 | methods5.kt:7:3:7:15 | new (...) | ClassInstanceExpr |
 | methods5.kt:7:13:7:14 | 42 | IntegerLiteral |
-| methods5.kt:8:3:8:3 | x | VarAccess |
 | methods5.kt:8:3:8:7 | ...=... | AssignExpr |
+| methods5.kt:8:3:8:7 | x | VarAccess |
 | methods5.kt:8:7:8:7 | 7 | IntegerLiteral |
 | methods5.kt:9:3:9:32 | int | TypeAccess |
 | methods5.kt:9:12:9:17 | C1<T1> | TypeAccess |
@@ -376,7 +376,7 @@
 | methods5.kt:10:13:10:18 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
 | methods5.kt:10:13:10:18 | Unit | TypeAccess |
 | methods5.kt:10:16:10:17 | 42 | IntegerLiteral |
-| methods6.kt:3:9:4:1 | Unit | TypeAccess |
+| methods6.kt:3:1:4:1 | Unit | TypeAccess |
 | methods.kt:2:1:3:1 | Unit | TypeAccess |
 | methods.kt:2:20:2:25 | int | TypeAccess |
 | methods.kt:2:28:2:33 | int | TypeAccess |
@@ -394,9 +394,9 @@
 | methods.kt:11:9:11:28 | topLevelMethod(...) | MethodCall |
 | methods.kt:11:24:11:24 | b | VarAccess |
 | methods.kt:11:27:11:27 | 4 | IntegerLiteral |
-| methods.kt:14:12:14:29 | Unit | TypeAccess |
-| methods.kt:15:15:15:35 | Unit | TypeAccess |
-| methods.kt:16:13:16:31 | Unit | TypeAccess |
-| methods.kt:17:14:17:33 | Unit | TypeAccess |
+| methods.kt:14:5:14:29 | Unit | TypeAccess |
+| methods.kt:15:5:15:35 | Unit | TypeAccess |
+| methods.kt:16:5:16:31 | Unit | TypeAccess |
+| methods.kt:17:5:17:33 | Unit | TypeAccess |
 | methods.kt:18:5:18:36 | Unit | TypeAccess |
-| methods.kt:19:12:19:29 | Unit | TypeAccess |
+| methods.kt:19:5:19:29 | Unit | TypeAccess |
diff --git a/java/ql/test-kotlin2/library-tests/methods/methods.expected b/java/ql/test-kotlin2/library-tests/methods/methods.expected
@@ -2,19 +2,19 @@ methods
 | clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:0:0:0:0 | <clinit> | <clinit>() | static | Compiler generated |
 | clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | getTopLevelInt | getTopLevelInt() | final, public, static | Compiler generated |
 | clinit.kt:0:0:0:0 | ClinitKt | clinit.kt:3:1:3:24 | setTopLevelInt | setTopLevelInt(int) | final, public, static | Compiler generated |
+| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component1 | component1() | final, public | Compiler generated |
+| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | component2 | component2() | final, public | Compiler generated |
+| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | copy | copy(int,java.lang.String) | final, public | Compiler generated |
+| 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 |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | equals | equals(java.lang.Object) | override, public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | hashCode | hashCode() | override, public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:0:0:0:0 | toString | toString() | override, public | Compiler generated |
-| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:1:1:47 | copy | copy(int,java.lang.String) | final, public | Compiler generated |
-| 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 |
-| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:22:1:31 | component1 | component1() | final, public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:22:1:31 | getX | getX() | final, public | Compiler generated |
-| dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | component2 | component2() | final, public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | getY | getY() | final, public | Compiler generated |
 | dataClass.kt:1:1:1:47 | DataClass | dataClass.kt:1:34:1:46 | setY | setY(java.lang.String) | final, public | Compiler generated |
-| delegates.kt:3:1:12:1 | MyClass | delegates.kt:4:5:6:5 | getLazyProp | getLazyProp() | final, public | Compiler generated |
-| delegates.kt:3:1:12:1 | MyClass | delegates.kt:8:5:11:5 | getObservableProp | getObservableProp() | final, public | Compiler generated |
+| delegates.kt:3:1:12:1 | MyClass | delegates.kt:4:21:6:5 | getLazyProp | getLazyProp() | final, public | Compiler generated |
 | delegates.kt:3:1:12:1 | MyClass | delegates.kt:8:5:11:5 | setObservableProp | setObservableProp(java.lang.String) | final, public | Compiler generated |
+| delegates.kt:3:1:12:1 | MyClass | delegates.kt:8:35:11:5 | getObservableProp | getObservableProp() | final, public | Compiler generated |
 | delegates.kt:4:21:6:5 | new KProperty1<MyClass,Integer>(...) { ... } | delegates.kt:4:21:6:5 | get | get(MyClass) | override, public |  |
 | delegates.kt:4:21:6:5 | new KProperty1<MyClass,Integer>(...) { ... } | delegates.kt:4:21:6:5 | invoke | invoke(MyClass) | override, public |  |
 | delegates.kt:4:26:6:5 | new Function0<Integer>(...) { ... } | delegates.kt:4:26:6:5 | invoke | invoke() | final, override, public |  |

diff --git a/java/ql/test-kotlin2/library-tests/methods/parameters.expected b/java/ql/test-kotlin2/library-tests/methods/parameters.expected
@@ -1,12 +1,12 @@
 | clinit.kt:3:1:3:24 | setTopLevelInt | clinit.kt:3:1:3:24 | <set-?> | 0 |
+| dataClass.kt:0:0:0:0 | copy | dataClass.kt:0:0:0:0 | x | 0 |
+| dataClass.kt:0:0:0:0 | copy | dataClass.kt:0:0:0:0 | y | 1 |
+| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p0 | 0 |
+| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p1 | 1 |
+| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p2 | 2 |
+| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p3 | 3 |
+| dataClass.kt:0:0:0:0 | copy$default | dataClass.kt:0:0:0:0 | p4 | 4 |
 | dataClass.kt:0:0:0:0 | equals | dataClass.kt:0:0:0:0 | other | 0 |
-| dataClass.kt:1:1:1:47 | copy | dataClass.kt:1:22:1:31 | x | 0 |
-| dataClass.kt:1:1:1:47 | copy | dataClass.kt:1:34:1:46 | y | 1 |
-| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p0 | 0 |
-| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p1 | 1 |
-| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p2 | 2 |
-| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p3 | 3 |
-| dataClass.kt:1:1:1:47 | copy$default | dataClass.kt:1:1:1:47 | p4 | 4 |
 | dataClass.kt:1:34:1:46 | setY | dataClass.kt:1:34:1:46 | <set-?> | 0 |
 | delegates.kt:4:21:6:5 | get | delegates.kt:4:21:6:5 | a0 | 0 |
 | delegates.kt:4:21:6:5 | invoke | delegates.kt:4:21:6:5 | a0 | 0 |