From a6f8af0de59b57eb83ab7d4a2d0a80bc8269aff5 Mon Sep 17 00:00:00 2001 From: Anders Fugmann Date: Wed, 14 Jan 2026 07:20:37 -0800 Subject: [PATCH] Kotlin: Accept column location changes in tests --- .../java_modifiers/test.expected | 2 +- .../jvmoverloads-external-class/test.expected | 16 ++++++------ .../kotlin_java_static_fields/test.expected | 26 +++++++++---------- .../nullability-annotations/test.expected | 8 +++--- .../posix/module_mangled_names/test.expected | 6 ++--- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/java/ql/integration-tests/kotlin/all-platforms/java_modifiers/test.expected b/java/ql/integration-tests/kotlin/all-platforms/java_modifiers/test.expected index a8040f7d82b..459a8d9209d 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/java_modifiers/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/java_modifiers/test.expected @@ -1,2 +1,2 @@ | extlib.jar/extlib/A.class:0:0:0:0 | m | protected | -| test.kt:4:3:4:22 | m | override, protected | +| test.kt:4:12:4:22 | m | override, protected | diff --git a/java/ql/integration-tests/kotlin/all-platforms/jvmoverloads-external-class/test.expected b/java/ql/integration-tests/kotlin/all-platforms/jvmoverloads-external-class/test.expected index db5d2c76680..26a090843ed 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/jvmoverloads-external-class/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/jvmoverloads-external-class/test.expected @@ -1,8 +1,8 @@ -| test.kt:3:3:3:45 | f | test.kt:3:23:3:32 | x | -| test.kt:3:3:3:45 | f | test.kt:3:35:3:40 | y | -| test.kt:3:3:3:45 | f | test.kt:3:35:3:40 | y | -| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p0 | -| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p1 | -| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p2 | -| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p3 | -| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p4 | +| test.kt:3:17:3:45 | f | test.kt:3:23:3:32 | x | +| test.kt:3:17:3:45 | f | test.kt:3:35:3:40 | y | +| test.kt:3:17:3:45 | f | test.kt:3:35:3:40 | y | +| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p0 | +| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p1 | +| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p2 | +| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p3 | +| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p4 | diff --git a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_static_fields/test.expected b/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_static_fields/test.expected index 9470b5e1e26..5839116cf34 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_static_fields/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_static_fields/test.expected @@ -1,22 +1,22 @@ edges -| hasFields.kt:5:5:5:34 | constField : String | ReadsFields.java:5:10:5:29 | HasFields.constField | provenance | | -| hasFields.kt:5:28:5:34 | "taint" : String | hasFields.kt:5:5:5:34 | constField : String | provenance | | -| hasFields.kt:7:5:7:38 | : String | hasFields.kt:7:5:7:38 | : String | provenance | | -| hasFields.kt:7:5:7:38 | : String | hasFields.kt:7:5:7:38 | lateinitField : String | provenance | | -| hasFields.kt:7:5:7:38 | lateinitField : String | ReadsFields.java:6:10:6:32 | HasFields.lateinitField | provenance | | -| hasFields.kt:9:5:9:50 | jvmFieldAnnotatedField : String | ReadsFields.java:7:10:7:41 | HasFields.jvmFieldAnnotatedField | provenance | | -| hasFields.kt:9:44:9:50 | "taint" : String | hasFields.kt:9:5:9:50 | jvmFieldAnnotatedField : String | provenance | | -| hasFields.kt:14:21:14:27 | "taint" : String | hasFields.kt:7:5:7:38 | : String | provenance | | +| hasFields.kt:5:11:5:34 | constField : String | ReadsFields.java:5:10:5:29 | HasFields.constField | provenance | | +| hasFields.kt:5:28:5:34 | "taint" : String | hasFields.kt:5:11:5:34 | constField : String | provenance | | +| hasFields.kt:7:14:7:38 | : String | hasFields.kt:7:14:7:38 | : String | provenance | | +| hasFields.kt:7:14:7:38 | : String | hasFields.kt:7:14:7:38 | lateinitField : String | provenance | | +| hasFields.kt:7:14:7:38 | lateinitField : String | ReadsFields.java:6:10:6:32 | HasFields.lateinitField | provenance | | +| hasFields.kt:9:15:9:50 | jvmFieldAnnotatedField : String | ReadsFields.java:7:10:7:41 | HasFields.jvmFieldAnnotatedField | provenance | | +| hasFields.kt:9:44:9:50 | "taint" : String | hasFields.kt:9:15:9:50 | jvmFieldAnnotatedField : String | provenance | | +| hasFields.kt:14:21:14:27 | "taint" : String | hasFields.kt:7:14:7:38 | : String | provenance | | nodes | ReadsFields.java:5:10:5:29 | HasFields.constField | semmle.label | HasFields.constField | | ReadsFields.java:6:10:6:32 | HasFields.lateinitField | semmle.label | HasFields.lateinitField | | ReadsFields.java:7:10:7:41 | HasFields.jvmFieldAnnotatedField | semmle.label | HasFields.jvmFieldAnnotatedField | -| hasFields.kt:5:5:5:34 | constField : String | semmle.label | constField : String | +| hasFields.kt:5:11:5:34 | constField : String | semmle.label | constField : String | | hasFields.kt:5:28:5:34 | "taint" : String | semmle.label | "taint" : String | -| hasFields.kt:7:5:7:38 | : String | semmle.label | : String | -| hasFields.kt:7:5:7:38 | : String | semmle.label | : String | -| hasFields.kt:7:5:7:38 | lateinitField : String | semmle.label | lateinitField : String | -| hasFields.kt:9:5:9:50 | jvmFieldAnnotatedField : String | semmle.label | jvmFieldAnnotatedField : String | +| hasFields.kt:7:14:7:38 | : String | semmle.label | : String | +| hasFields.kt:7:14:7:38 | : String | semmle.label | : String | +| hasFields.kt:7:14:7:38 | lateinitField : String | semmle.label | lateinitField : String | +| hasFields.kt:9:15:9:50 | jvmFieldAnnotatedField : String | semmle.label | jvmFieldAnnotatedField : String | | hasFields.kt:9:44:9:50 | "taint" : String | semmle.label | "taint" : String | | hasFields.kt:14:21:14:27 | "taint" : String | semmle.label | "taint" : String | subpaths diff --git a/java/ql/integration-tests/kotlin/all-platforms/nullability-annotations/test.expected b/java/ql/integration-tests/kotlin/all-platforms/nullability-annotations/test.expected index 8dd20ad64a4..89eb06d26c3 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/nullability-annotations/test.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/nullability-annotations/test.expected @@ -22,7 +22,7 @@ | ktUser.kt:0:0:0:0 | nullableAnnotated | parameter | ktUser.kt:0:0:0:0 | Nullable | | ktUser.kt:0:0:0:0 | nullableAnnotated | return value | ktUser.kt:0:0:0:0 | A | | ktUser.kt:0:0:0:0 | nullableAnnotated | return value | ktUser.kt:0:0:0:0 | Nullable | -| ktUser.kt:5:3:5:105 | f | parameter | ktUser.kt:0:0:0:0 | NotNull | -| ktUser.kt:5:3:5:105 | f | parameter | ktUser.kt:5:12:5:13 | A | -| ktUser.kt:5:3:5:105 | f | return value | ktUser.kt:0:0:0:0 | NotNull | -| ktUser.kt:5:3:5:105 | f | return value | ktUser.kt:5:3:5:4 | A | +| ktUser.kt:5:6:5:105 | f | parameter | ktUser.kt:0:0:0:0 | NotNull | +| ktUser.kt:5:6:5:105 | f | parameter | ktUser.kt:5:12:5:13 | A | +| ktUser.kt:5:6:5:105 | f | return value | ktUser.kt:0:0:0:0 | NotNull | +| ktUser.kt:5:6:5:105 | f | return value | ktUser.kt:5:3:5:4 | A | diff --git a/java/ql/integration-tests/kotlin/posix/module_mangled_names/test.expected b/java/ql/integration-tests/kotlin/posix/module_mangled_names/test.expected index 51b4fd853ff..a1fc953a254 100644 --- a/java/ql/integration-tests/kotlin/posix/module_mangled_names/test.expected +++ b/java/ql/integration-tests/kotlin/posix/module_mangled_names/test.expected @@ -1,4 +1,4 @@ | User.java:3:21:3:24 | test | -| test1.kt:3:3:3:22 | f$main | -| test2.kt:3:3:3:22 | f$mymodule | -| test3.kt:3:3:3:22 | f$reservedchars___ | +| test1.kt:3:12:3:22 | f$main | +| test2.kt:3:12:3:22 | f$mymodule | +| test3.kt:3:12:3:22 | f$reservedchars___ |