Skip to content

Commit f24abee

Browse files
authored
Merge pull request github#14323 from igfoo/igfoo/supportk2
Kotlin: Claim to support Kotlin 2
2 parents 13d3e97 + 497d48b commit f24abee

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
88
import com.intellij.mock.MockProject
99
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
1010
import org.jetbrains.kotlin.config.CompilerConfiguration
11+
import com.github.codeql.Kotlin2ComponentRegistrar
1112

12-
@OptIn(ExperimentalCompilerApi::class)
13-
class KotlinExtractorComponentRegistrar : ComponentRegistrar {
13+
class KotlinExtractorComponentRegistrar : Kotlin2ComponentRegistrar() {
1414
override fun registerProjectComponents(
1515
project: MockProject,
1616
configuration: CompilerConfiguration
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// For ComponentRegistrar
2+
@file:Suppress("DEPRECATION")
3+
4+
package com.github.codeql
5+
6+
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
7+
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
8+
9+
@OptIn(ExperimentalCompilerApi::class)
10+
abstract class Kotlin2ComponentRegistrar : ComponentRegistrar {
11+
/* Nothing to do; supportsK2 doesn't exist yet. */
12+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// For ComponentRegistrar
2+
@file:Suppress("DEPRECATION")
3+
4+
package com.github.codeql
5+
6+
import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
7+
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
8+
9+
@OptIn(ExperimentalCompilerApi::class)
10+
abstract class Kotlin2ComponentRegistrar : ComponentRegistrar {
11+
override val supportsK2: Boolean
12+
get() = true
13+
}

0 commit comments

Comments
 (0)