From 1c90d8a960988407078aa42268412321f6fe10b3 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 26 Apr 2022 15:34:43 +0300 Subject: [PATCH] KT-52038 Kapt. Disable FIR for kapt run automatically --- .../src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt index d1d3a6757a5..d4e35668d50 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt @@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.base.kapt3.* import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageRenderer import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot @@ -67,6 +68,13 @@ class Kapt3CommandLineProcessor : CommandLineProcessor { if (option !is KaptCliOption) { throw CliOptionProcessingException("Unknown option: ${option.optionName}") } + if (configuration.getBoolean(CommonConfigurationKeys.USE_FIR)) { + configuration[CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY]?.report( + CompilerMessageSeverity.STRONG_WARNING, + "ATTENTION!\n kapt currently doesn't support experimental K2 compiler, disabling K2 for kapt run" + ) + configuration.put(CommonConfigurationKeys.USE_FIR, false) + } val kaptOptions = configuration[KAPT_OPTIONS] ?: KaptOptions.Builder().also { configuration.put(KAPT_OPTIONS, it) }