K2 KAPT: Do not run compiler plugins in KAPT mode
#KT-70411 Fixed
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/jvmCompilerPipeline.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/jvmCompilerPipeline.kt
index 9f414ae..c38a230 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/jvmCompilerPipeline.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/jvmCompilerPipeline.kt
@@ -163,10 +163,15 @@
): ModuleCompilerIrBackendInput {
val extensions = JvmFir2IrExtensions(input.configuration, JvmIrDeserializerImpl())
- val irGenerationExtensions =
+ val kaptMode = input.configuration.getBoolean(JVMConfigurationKeys.SKIP_BODIES)
+
+ val irGenerationExtensions = if (!kaptMode) {
(environment.projectEnvironment as? VfsBasedProjectEnvironment)?.project?.let {
IrGenerationExtension.getInstances(it)
} ?: emptyList()
+ } else {
+ emptyList()
+ }
val (moduleFragment, components, pluginContext, irActualizedResult, _, symbolTable) =
analysisResults.convertToIrAndActualizeForJvm(
extensions, input.configuration, environment.diagnosticsReporter, irGenerationExtensions,
diff --git a/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/FirKaptAnalysisHandlerExtension.kt b/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/FirKaptAnalysisHandlerExtension.kt
index 2d342cf..fec8514 100644
--- a/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/FirKaptAnalysisHandlerExtension.kt
+++ b/plugins/kapt4/src/org/jetbrains/kotlin/kapt4/FirKaptAnalysisHandlerExtension.kt
@@ -8,6 +8,8 @@
import com.intellij.openapi.Disposable
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
+import com.intellij.openapi.vfs.StandardFileSystems
+import com.intellij.openapi.vfs.VirtualFileManager
import com.sun.tools.javac.tree.JCTree
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.GroupedKtSources
@@ -122,8 +124,13 @@
val disposable = Disposer.newDisposable("K2KaptSession.project")
try {
+ val coreEnvironment =
+ KotlinCoreEnvironment.createForProduction(disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
val projectEnvironment =
- createProjectEnvironment(updatedConfiguration, disposable, EnvironmentConfigFiles.JVM_CONFIG_FILES, messageCollector)
+ VfsBasedProjectEnvironment(
+ project,
+ VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL)
+ ) { coreEnvironment.createPackagePartProvider(it) }
if (messageCollector.hasErrors()) {
return false
}
