Skip to content

Commit 2e8db58

Browse files
committed
Kotlin: Fix bazel format and address copilot review comments
1 parent ecc8a91 commit 2e8db58

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

java/kotlin-extractor/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ kt_javac_options(
124124
javac_opts = ":javac-options",
125125
kotlinc_opts = ":kotlinc-options-%s" % v,
126126
module_name = "codeql-kotlin-extractor",
127-
# resource_strip_prefix is very nit-picky: the following makes it work from
128-
# `codeql`, `@codeql_kotlin_embeddable` and `semmle-code`
129127
resources = [
130128
":resources-%s" % v,
131129
],

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2975,7 +2975,7 @@ open class KotlinFileExtractor(
29752975
val locId = tw.getLocation(s)
29762976
tw.writeStmts_block(blockId, parent, idx, callable)
29772977
tw.writeHasLocation(blockId, locId)
2978-
// For Kotlin < 2.3, s.deligate is not-nullable. Cast to a be nullable,
2978+
// For Kotlin < 2.3, s.delegate is not-nullable. Cast to a be nullable,
29792979
// as a workaround to silence warnings for kotlin < 2.3 about the elvis
29802980
// operator being redundant.
29812981
// For Kotlin >= 2.3, the cast is redundant, so we need to silence that warning

misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/MODULE.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module(
77

88
bazel_dep(name = "platforms", version = "0.0.11")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
10-
# bazel_dep(name = "rules_java", version = "7.2.0")
1110
bazel_dep(name = "rules_java", version = "7.2.0")
1211
bazel_dep(name = "rules_android", version = "0.6.4")
1312
bazel_dep(name = "bazel_features", version = "1.25.0")
@@ -28,10 +27,10 @@ use_repo(
2827
"com_github_google_ksp",
2928
"com_github_jetbrains_kotlin",
3029
"com_github_pinterest_ktlint",
30+
"kotlin_build_tools_impl",
3131
"kotlinx_serialization_core_jvm",
3232
"kotlinx_serialization_json",
3333
"kotlinx_serialization_json_jvm",
34-
"kotlin_build_tools_impl",
3534
)
3635

3736
register_toolchains("//kotlin/internal:default_toolchain")

0 commit comments

Comments
 (0)