Merge pull request #14323 from igfoo/igfoo/supportk2

Kotlin: Claim to support Kotlin 2
github · Sep 27, 2023 · f24abee · f24abee
2 parents 13d3e97 + 497d48b
commit f24abee
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorComponentRegistrar.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorComponentRegistrar.kt
@@ -8,9 +8,9 @@ import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import com.intellij.mock.MockProject
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
+import com.github.codeql.Kotlin2ComponentRegistrar
 
-@OptIn(ExperimentalCompilerApi::class)
-class KotlinExtractorComponentRegistrar : ComponentRegistrar {
+class KotlinExtractorComponentRegistrar : Kotlin2ComponentRegistrar() {
     override fun registerProjectComponents(
         project: MockProject,
         configuration: CompilerConfiguration

diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Kotlin2ComponentRegistrar.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_4_32/Kotlin2ComponentRegistrar.kt
@@ -0,0 +1,12 @@
+// For ComponentRegistrar
+@file:Suppress("DEPRECATION")
+
+package com.github.codeql
+
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
+
+@OptIn(ExperimentalCompilerApi::class)
+abstract class Kotlin2ComponentRegistrar : ComponentRegistrar {
+    /* Nothing to do; supportsK2 doesn't exist yet. */
+}
diff --git a/...kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_0-Beta/Kotlin2ComponentRegistrar.kt b/...kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_0-Beta/Kotlin2ComponentRegistrar.kt
@@ -0,0 +1,13 @@
+// For ComponentRegistrar
+@file:Suppress("DEPRECATION")
+
+package com.github.codeql
+
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
+
+@OptIn(ExperimentalCompilerApi::class)
+abstract class Kotlin2ComponentRegistrar : ComponentRegistrar {
+    override val supportsK2: Boolean
+        get() = true
+}