azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable FIR plugin in SerializationComponentRegistrar

Browse Source 
so real projects can be built with K2 and serialization.

Correctly register renderer for serialization plugin errors.
This commit is contained in:
Leonid Startsev
2022-11-15 19:18:31 +01:00
committed by Space Team
parent 702d0b4d54
commit 56cd150554
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlinx-serialization/kotlinx-serialization.cli/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationComponentRegistrar.kt
+5 -1
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.container.StorageComponentContainer
import org.jetbrains.kotlin.container.useInstance
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
import org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension
import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
@@ -23,6 +24,7 @@ import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin
import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
import org.jetbrains.kotlinx.serialization.compiler.diagnostic.SerializationPluginDeclarationChecker
import org.jetbrains.kotlinx.serialization.compiler.extensions.SerializationConfigurationKeys.DISABLE_INTRINSIC
import org.jetbrains.kotlinx.serialization.compiler.fir.FirSerializationExtensionRegistrar
object SerializationConfigurationKeys {
val DISABLE_INTRINSIC: CompilerConfigurationKey<Boolean> =
@@ -57,7 +59,7 @@ class SerializationComponentRegistrar : CompilerPluginRegistrar() {
if (configuration.get(DISABLE_INTRINSIC) == true) SerializationIntrinsicsState.DISABLED else SerializationIntrinsicsState.NORMAL
override val supportsK2: Boolean
get() = false
get() = true
companion object {
fun registerExtensions(extensionStorage: ExtensionStorage, intrinsicsState: SerializationIntrinsicsState = SerializationIntrinsicsState.NORMAL) = with(extensionStorage) {
@@ -76,6 +78,8 @@ class SerializationComponentRegistrar : CompilerPluginRegistrar() {
IrGenerationExtension.registerExtension(SerializationLoweringExtension(serializationDescriptorSerializer, intrinsicsState))
StorageComponentContainerContributor.registerExtension(SerializationPluginComponentContainerContributor())
FirExtensionRegistrarAdapter.registerExtension(FirSerializationExtensionRegistrar())
}
private fun registerProtoExtensions() {