Updates rules_kotlin to support Kotlin v2.2.20

Author: ryanulep

kotlin/internal/toolchains.bzl

@@ -134,7 +134,7 @@ _kt_toolchain = rule(
         ),
         "language_version": attr.string(
             doc = "this is the -language_version flag [see](https://kotlinlang.org/docs/reference/compatibility.html)",
-            default = "2.1",
+            default = "2.2",
             values = [
                 "1.1",
                 "1.2",
@@ -147,11 +147,12 @@ _kt_toolchain = rule(
                 "1.9",
                 "2.0",
                 "2.1",
+		        "2.2",
             ],
         ),
         "api_version": attr.string(
             doc = "this is the -api_version flag [see](https://kotlinlang.org/docs/reference/compatibility.html).",
-            default = "2.1",
+            default = "2.2",
             values = [
                 "1.1",
                 "1.2",
@@ -164,6 +165,7 @@ _kt_toolchain = rule(
                 "1.9",
                 "2.0",
                 "2.1",
+		        "2.2",
             ],
         ),
         "debug": attr.string_list(

src/main/kotlin/bootstrap.bzl

@@ -37,6 +37,9 @@ def kt_bootstrap_library(name, deps = [], neverlink_deps = [], srcs = [], visibi
         **kwargs
     )
 
+    # Filter out kotlinc_opts from kwargs for ktlint rules (they don't support it)
+    ktlint_kwargs = {k: v for k, v in kwargs.items() if k != "kotlinc_opts"}
+
     _ktlint_test(
         name = "%s_ktlint_test" % name,
         srcs = srcs,
@@ -51,7 +54,7 @@ def kt_bootstrap_library(name, deps = [], neverlink_deps = [], srcs = [], visibi
         visibility = ["//visibility:private"],
         config = "//:ktlint_editorconfig",
         tags = ["no-ide", "ktlint"],
-        **kwargs
+        **ktlint_kwargs
     )
 
 def kt_bootstrap_binary(

src/main/kotlin/io/bazel/kotlin/generate/BUILD.bazel

@@ -12,7 +12,6 @@ kt_jvm_import(
         "//kotlin/compiler:kotlin-stdlib-jdk7",
         "//kotlin/compiler:kotlin-stdlib-jdk8",
         "//kotlin/compiler:kotlinx-coroutines-core-jvm",
-        "//kotlin/compiler:trove4j",
     ],
 )
 

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel

@@ -25,6 +25,9 @@ kt_bootstrap_library(
         "k2/checker/declaration/*.kt",
         "k2/checker/expression/*.kt",
     ]),
+    kotlinc_opts = {
+        "-Xcontext-parameters": "",
+    },
     visibility = ["//src:__subpackages__"],
     deps = [
         "//kotlin/compiler:kotlin-compiler",

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/k2/checker/declaration/BasicDeclarationChecker.kt

@@ -11,10 +11,9 @@ import org.jetbrains.kotlin.fir.declarations.toAnnotationClassLikeSymbol
 internal class BasicDeclarationChecker(
   private val classUsageRecorder: ClassUsageRecorder,
 ) : FirBasicDeclarationChecker(MppCheckerKind.Common) {
+  context(context: CheckerContext, reporter: DiagnosticReporter)
   override fun check(
     declaration: FirDeclaration,
-    context: CheckerContext,
-    reporter: DiagnosticReporter,
   ) {
     declaration.annotations.forEach { annotation ->
       annotation.toAnnotationClassLikeSymbol(context.session)?.let {

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/k2/checker/declaration/CallableChecker.kt

@@ -16,10 +16,9 @@ internal class CallableChecker(
    * Tracks the return type & type parameters of a callable declaration. Function parameters are
    * tracked in [FunctionChecker].
    */
+  context(context: CheckerContext, reporter: DiagnosticReporter)
   override fun check(
     declaration: FirCallableDeclaration,
-    context: CheckerContext,
-    reporter: DiagnosticReporter,
   ) {
     // return type
     declaration.returnTypeRef.let { classUsageRecorder.recordTypeRef(it, context) }

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/k2/checker/declaration/ClassLikeChecker.kt

@@ -11,10 +11,9 @@ import org.jetbrains.kotlin.fir.resolve.getSuperTypes
 internal class ClassLikeChecker(
   private val classUsageRecorder: ClassUsageRecorder,
 ) : FirClassLikeChecker(MppCheckerKind.Common) {
+  context(context: CheckerContext, reporter: DiagnosticReporter)
   override fun check(
     declaration: FirClassLikeDeclaration,
-    context: CheckerContext,
-    reporter: DiagnosticReporter,
   ) {
     declaration.symbol.let { classUsageRecorder.recordClass(it, context) }
     // [recordClass] also handles supertypes, but this marks direct supertypes as explicit

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/k2/checker/declaration/FileChecker.kt

@@ -22,10 +22,9 @@ import org.jetbrains.kotlin.name.ClassId
 internal class FileChecker(
   private val classUsageRecorder: ClassUsageRecorder,
 ) : FirFileChecker(MppCheckerKind.Common) {
+  context(context: CheckerContext, reporter: DiagnosticReporter)
   override fun check(
     declaration: FirFile,
-    context: CheckerContext,
-    reporter: DiagnosticReporter,
   ) {
     declaration.imports.filterIsInstance<FirResolvedImport>().forEach { import ->
       // check for classlike import (class, interface, object, enum, annotation, etc)

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/k2/checker/declaration/FunctionChecker.kt

@@ -14,10 +14,9 @@ internal class FunctionChecker(
    * Tracks the value parameters of a function declaration. Return type & type parameters are
    * tracked in [CallableChecker].
    */
+  context(context: CheckerContext, reporter: DiagnosticReporter)
   override fun check(
     declaration: FirFunction,
-    context: CheckerContext,
-    reporter: DiagnosticReporter,
   ) {
     // function parameters
     declaration.valueParameters.forEach { valueParam ->

src/main/kotlin/io/bazel/kotlin/plugin/jdeps/k2/checker/expression/QualifiedAccessChecker.kt

@@ -21,10 +21,9 @@ import org.jetbrains.kotlin.KtSourceElement
 internal class QualifiedAccessChecker(
   private val classUsageRecorder: ClassUsageRecorder,
 ) : FirQualifiedAccessExpressionChecker(MppCheckerKind.Common) {
+  context(context: CheckerContext, reporter: DiagnosticReporter)
   override fun check(
     expression: FirQualifiedAccessExpression,
-    context: CheckerContext,
-    reporter: DiagnosticReporter,
   ) {
     // track function's owning class
     val resolvedCallableSymbol = expression.toResolvedCallableSymbol()